Adam Powell
20ba658bdb
am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar
...
* commit '31049d76c55b18a6d9993f0d9687598740b16014':
Use SCREEN Xfermode for keyguard badges; update SeekBar
2013-10-07 16:25:17 -07:00
Adam Powell
31049d76c5
Use SCREEN Xfermode for keyguard badges; update SeekBar
...
Plumb through the necessary API features through Drawables and
ImageView but leave it hidden for now pending future API review and
plumbing through the rest of the framework Drawable implementations.
Update SeekBar assets used for keyguard transport control.
Set selected status directly instead of finding views by id.
Bug 10531608
Bug 10784913
Change-Id: Ia38bd04ad1bc26e9e6da1dda8a374c9ba3ceccb3
2013-10-07 16:14:17 -07:00
Jim Miller
bc015e847f
am dbc31105: Merge "Disable keyguard text marquee when the display turns off." into klp-dev
...
* commit 'dbc31105bda3591d64e4d3e2abb3b3eaf857222e':
Disable keyguard text marquee when the display turns off.
2013-10-07 16:08:54 -07:00
Jim Miller
dbc31105bd
Merge "Disable keyguard text marquee when the display turns off." into klp-dev
2013-10-07 23:06:21 +00:00
Adam Lesinski
ea4e07518c
am c884fc9f: Merge "AAPT emits error for res with no \'default\' product" into klp-dev
...
* commit 'c884fc9f26b1707f89ae4e1e163e051996f96bb8':
AAPT emits error for res with no 'default' product
2013-10-07 16:00:11 -07:00
Adam Lesinski
c884fc9f26
Merge "AAPT emits error for res with no 'default' product" into klp-dev
2013-10-07 22:57:38 +00:00
Jim Miller
20daffd91e
Disable keyguard text marquee when the display turns off.
...
Fixes bug 11116666
Change-Id: Id9abb9d0531bcf4c5da7014ed4b9b202652b3754
2013-10-07 15:50:43 -07:00
Igor Murashkin
c80938266f
am 46ea9b0b: Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev
...
* commit '46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d':
camera2: Workaround for null FACE_DETECT_MODE crashing
2013-10-07 15:41:09 -07:00
Igor Murashkin
46ea9b0b04
Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev
2013-10-07 22:38:37 +00:00
Dianne Hackborn
fcdbc82ba3
am cade4089: Merge "Fix issue #11113111 : dumpsys activity service
is broken" into klp-dev
...
* commit 'cade4089e75df2c9ef86aa1a37f3396e0d4b57d5':
Fix issue #11113111 : `dumpsys activity service` is broken
2013-10-07 15:33:25 -07:00
Dianne Hackborn
cade4089e7
Merge "Fix issue #11113111 : dumpsys activity service
is broken" into klp-dev
2013-10-07 22:30:34 +00:00
Igor Murashkin
e37885a8a3
camera2: Workaround for null FACE_DETECT_MODE crashing
...
Bug: 11118679
Change-Id: Id9b055744f6a2f502857b4cc0c5badb46b44a1f8
2013-10-07 15:29:58 -07:00
Svetoslav Ganov
f30b647440
am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev
...
* commit 'c2d6e51d6c27eb8f3ca917b467e4a6d55d10cdc8':
The undefined media sizes for both orientations not properly constructed.
2013-10-07 15:24:39 -07:00
Svetoslav Ganov
c2d6e51d6c
Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev
2013-10-07 22:21:52 +00:00
Zhijun He
e32e311a11
am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev
...
* commit 'c37a5ab54e5e3ad3bb816d7c9e2b923af6f74f73':
Camera2: fix Face class java doc build break
2013-10-07 14:58:04 -07:00
Zhijun He
c37a5ab54e
Merge "Camera2: fix Face class java doc build break" into klp-dev
2013-10-07 21:53:28 +00:00
Jeff Sharkey
5e02e0a9e1
am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev
...
* commit 'bcc77b502b56d4b91610adfa10c657003c9c820d':
Add <intent-filter> support to <provider>.
2013-10-07 14:44:52 -07:00
Jeff Sharkey
bcc77b502b
Merge "Add <intent-filter> support to <provider>." into klp-dev
2013-10-07 21:41:45 +00:00
Jeff Sharkey
73c3c65b1b
am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev
...
* commit '567fdd9fbaae4a3f6f8dc123769771881a50ed70':
When launched into empty recents, show drawer.
2013-10-07 14:41:17 -07:00
Dianne Hackborn
13c590de1e
Fix issue #11113111 : dumpsys activity service
is broken
...
Change-Id: Ie02d27b377c562085ef7eb5dea144ce2f382c11d
2013-10-07 14:36:47 -07:00
Jeff Sharkey
567fdd9fba
Merge "When launched into empty recents, show drawer." into klp-dev
2013-10-07 21:36:25 +00:00
Zhijun He
04eceec132
Camera2: fix Face class java doc build break
...
Bug: 10406212
Change-Id: Ida4da1ee3f67e176e04d07f569e153d671fa9e40
2013-10-07 14:35:57 -07:00
Jeff Sharkey
85f5f81320
Add <intent-filter> support to <provider>.
...
For the new documents work, we're only interested in the subset of
ContentProviders that actually implement DocumentsContract. Instead
of returning all providers, add <intent-filter> support to make it
easier to limit the set of returned ProviderInfo.
Define a well-known action for DocumentsProviders, and start using it
when querying for roots. Continue supporting the old <meta-data>
approach until all apps have been updated.
Bug: 8599233
Change-Id: I05f049bba21311f5421738002f99ee214447c909
2013-10-07 14:19:13 -07:00
Eino-Ville Talvala
474c79e80a
am ad45fa64: Merge "Camera2: Fire all callbacks" into klp-dev
...
* commit 'ad45fa64382fa00778ff8ddfd1ac65d81fd55404':
Camera2: Fire all callbacks
2013-10-07 14:13:22 -07:00
Eino-Ville Talvala
ad45fa6438
Merge "Camera2: Fire all callbacks" into klp-dev
2013-10-07 21:10:41 +00:00
Mike Klein
aa24442ecf
am d0f379c1: Preserve fill type in Path.reset().
...
* commit 'd0f379c1976c600313f1f4c39f2587a649e3a4fc':
Preserve fill type in Path.reset().
2013-10-07 14:09:54 -07:00
Jeff Sharkey
a82c2e24bc
When launched into empty recents, show drawer.
...
Pull out drawer to give users more context about meaningful places
to navigate to. Also fix bug where restored roots weren't being
highlighted.
Bug: 10852518
Change-Id: Id294f6923477ca4dc505c4b0a21a5bdf8b722cf4
2013-10-07 14:08:20 -07:00
Mike Klein
d0f379c197
Preserve fill type in Path.reset().
...
Bug: 10838355
Change-Id: I7bdecb945fc35dfed02d37745678ae7bda906628
2013-10-07 21:04:47 +00:00
Rachad Alao
0ed8c93cff
am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev
...
* commit '00fb27dda8c74229ea55b524063410842ba4a21e':
Camera2: add metadata override
2013-10-07 13:42:52 -07:00
Rachad Alao
00fb27dda8
Merge "Camera2: add metadata override" into klp-dev
2013-10-07 20:40:22 +00:00
Jeff Sharkey
0e438c2a1b
am a27366ef: Merge "Ellipsize titles in middle, otherwise end." into klp-dev
...
* commit 'a27366efc4cac889ef454b13fa74bb4c4473b2f1':
Ellipsize titles in middle, otherwise end.
2013-10-07 13:19:22 -07:00
Jeff Sharkey
a27366efc4
Merge "Ellipsize titles in middle, otherwise end." into klp-dev
2013-10-07 20:17:54 +00:00
Baligh Uddin
a67fc7b742
am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '6ac16894a9f24211ceb57de34afbf3e2d7bde7a9':
Import translations. DO NOT MERGE
2013-10-07 12:45:49 -07:00
Baligh Uddin
bc8b193b22
am e7f1a0db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'e7f1a0db37ac1b2ffe107774f60bd956d590c2f4':
Import translations. DO NOT MERGE
2013-10-07 12:45:46 -07:00
Baligh Uddin
05f3b6ac65
am 79bcca23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '79bcca2311c48552a6fed8b441e65568fc889da8':
Import translations. DO NOT MERGE
2013-10-07 12:45:44 -07:00
Baligh Uddin
4d1fac943f
am 8cc94767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '8cc94767b5d2c5d6f98517fd4fa34b4f31704c63':
Import translations. DO NOT MERGE
2013-10-07 12:45:42 -07:00
Baligh Uddin
917d56c73f
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-07 19:44:14 +00:00
Baligh Uddin
6ac16894a9
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-07 19:44:10 +00:00
Baligh Uddin
e7f1a0db37
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-07 19:44:02 +00:00
Baligh Uddin
621674dd64
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-07 19:43:54 +00:00
Baligh Uddin
79bcca2311
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-07 19:43:50 +00:00
Baligh Uddin
43e404591e
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-07 19:43:39 +00:00
Baligh Uddin
8cc94767b5
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-07 19:43:34 +00:00
Eino-Ville Talvala
868d904306
Camera2: Fire all callbacks
...
- Allow configureOutputs to be called when device is
actively working, and document what happens then.
- At the managed level, trigger proper sequence of callbacks for
device state changes, for all the callbacks that are not yet
managed by the camera service.
- Restructure CameraManager.openDevice to have the device itself fire the
initial callbacks.
- Make CameraDevice.configureOutputs(null) work.
- Make CameraDeviec.configureOutputs(identical surfaces) work.
- Ensure proper checking for camera closed state.
Bug: 10360518
Change-Id: I9db348ee9c5ce4d3fe02fd34e779acc85cba68dc
2013-10-07 12:40:49 -07:00
Jeff Sharkey
2c4b99fbe6
Ellipsize titles in middle, otherwise end.
...
Long document titles can include distinguishing details at the end
of the title, so ellipsize in the middle. All other details ellipsize
at the end.
Bug: 11081420
Change-Id: I2c266ebc594d2ad383033b435acb8adb5fb823bc
2013-10-07 11:39:07 -07:00
Baligh Uddin
8e3e6cb1a1
Import translations. DO NOT MERGE
...
Change-Id: I0647ab81e403652058dd10130238ed5fb98911d9
Auto-generated-cl: translation import
2013-10-07 10:44:10 -07:00
Baligh Uddin
0ea4be04a0
Import translations. DO NOT MERGE
...
Change-Id: I4365c56d96fc1e1aa97e05d154ce23441c5b1431
Auto-generated-cl: translation import
2013-10-07 10:43:11 -07:00
John Spurlock
1fc7bd3eb2
am 619fc89a: Merge "Fix transparent -> translucent reference in private docs." into klp-dev
...
* commit '619fc89aa176a4fa2895933d536987bb278acfb5':
Fix transparent -> translucent reference in private docs.
2013-10-07 10:07:19 -07:00
John Spurlock
f2ec90f26c
am 2788712a: Merge "Update qs asset outlines." into klp-dev
...
* commit '2788712abb3b35cdaed253a2c221b2dd791e95af':
Update qs asset outlines.
2013-10-07 10:07:16 -07:00
Jean-Michel Trivi
65d577139c
am bacb5422: Merge "Also rely on enabled notification listeners for RemoteController registration" into klp-dev
...
* commit 'bacb5422bc4670d2b8905d9f58d068a97836561f':
Also rely on enabled notification listeners for RemoteController registration
2013-10-07 10:07:14 -07:00