OSDN Git Service
Jorim Jaggi [Tue, 25 Nov 2014 19:31:44 +0000 (19:31 +0000)]
am
c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev
* commit '
c1de25d8ebaecff697c1d5dfaa445e18ee07fa2d':
Animate notifs depending on touch when exiting doze mode
Jorim Jaggi [Tue, 25 Nov 2014 19:28:37 +0000 (19:28 +0000)]
Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev
Jorim Jaggi [Mon, 24 Nov 2014 20:45:20 +0000 (21:45 +0100)]
Animate notifs depending on touch when exiting doze mode
When exiting doze mode during pulsing and the reason for the wakeup
is a touch event, we calculate the delay of the animations to animate
the notification from black/white to color depending on the point
where the touch happened to wake up the screen.
Bug:
18146441
Change-Id: Ica76b235d629acfc2b09b5f56027c688502f89d8
Robin Lee [Tue, 25 Nov 2014 19:17:43 +0000 (19:17 +0000)]
am
692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev
* commit '
692e4933f01f5f7d0c16dcbcd96127897d054511':
DevicePolicy: Don't warn about managed profile CAs
Robin Lee [Tue, 25 Nov 2014 19:10:58 +0000 (19:10 +0000)]
Merge "DevicePolicy: Don't warn about managed profile CAs" into lmp-mr1-dev
Chris Craik [Tue, 25 Nov 2014 18:51:59 +0000 (18:51 +0000)]
am
ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev
* commit '
ee6606519d22805c1caf23a3c75cde9fc97b34eb':
Improve DisplayList state output
Dianne Hackborn [Tue, 25 Nov 2014 18:45:28 +0000 (18:45 +0000)]
am
d0f6b4f6: Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev
* commit '
d0f6b4f6297373e569e383edc21aaa3f87591e0b':
Start MountService before performBootDexOpt
John Spurlock [Tue, 25 Nov 2014 18:45:23 +0000 (18:45 +0000)]
am
bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev
* commit '
bc6f59a1ef341231c2b57e0cde691be1a5a32203':
VolumeZen: Introduce internal vs external ringer mode.
Chris Craik [Tue, 25 Nov 2014 18:45:10 +0000 (18:45 +0000)]
Merge "Improve DisplayList state output" into lmp-mr1-dev
Dianne Hackborn [Tue, 25 Nov 2014 18:42:57 +0000 (18:42 +0000)]
Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev
padarshr [Wed, 5 Nov 2014 11:24:50 +0000 (16:54 +0530)]
Start MountService before performBootDexOpt
This change is to start Mountservice before starting
performBootDexOpt, as in one case, in performBootDexOpt
when system upgrade happens, StorageManager will be started to
get the low threshold of DataDir. But, at this point, as
Mountservice is still not up, StorageManager will end up
having a null object of Mountservice.
Change-Id: I6dec474266faa5de67449c1bbe6ef30791e5ecaa
John Spurlock [Tue, 25 Nov 2014 18:40:53 +0000 (18:40 +0000)]
Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev
John Spurlock [Mon, 17 Nov 2014 15:29:10 +0000 (10:29 -0500)]
VolumeZen: Introduce internal vs external ringer mode.
Stabilize mapping between ringer-mode=silent and zen=priority
by keeping track of two ringer modes:
- Internal ringer mode: Used for underlying stream muting
- External ringer mode: Reported to clients
The mapping between external ringer mode + zen is:
- normal = all
- vibrate = all
- silent = priority (read-write) or none (read)
Changes include:
- Remove "zen check" from audio service, back to audio
service having no knowledge of zen.
- Maintain a new external ringer mode in audio service,
this is the ringer mode reported through AudioManager
to callers, also mapped to the change intent.
- Introduce a "ringer mode delegate" to the local
audio manager interface, responsible for observing
external / internal mode changes, and making changes
if necessary.
- Internal ringer mode changes are still interesting
to the volume dialog, wire up a callback through
the existing IVolumeController interface.
- On devices without vibration, the mapping is the same
but since no ringer mode change is possible, disable
the icon toggle and remove the mute icon when volume=0.
- On devices with vibration, volume down presses should
pulse the vibrate icon (and vibrate) as a hint that this
is as low as the device can go using the keys. Since
the mechanics are similar to the existing zen=none hint,
pull into shared helper.
- Log ringer mode changes to the zen log, include calling
package information for issue diagnosis.
- Include whether vibration is supported in the audio service
dump.
- Update the status bar icon policy to use the internal ringer
mode, not the external mode (for vibrate icon).
- Update the "Muted by <x>" logic, include current suppressor
in dumpsys, ensure suppression icon is enabled & !clickable,
regardless of zen mode.
Bug:
17884168
Bug:
15471679
Bug:
16824970
Change-Id: Ia7d3bb23ce6d1e37b24fb6521d1c1ab9bb8f60c0
Andres Morales [Tue, 25 Nov 2014 17:41:30 +0000 (17:41 +0000)]
am
59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev
* commit '
59093d925decaf6ddf2e952de25e3cdd1b492d81':
Define permission for system apps to query size of block
Andres Morales [Tue, 25 Nov 2014 17:35:19 +0000 (17:35 +0000)]
Merge "Define permission for system apps to query size of block" into lmp-mr1-dev
Bo Liu [Tue, 25 Nov 2014 16:59:27 +0000 (16:59 +0000)]
am
84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev
* commit '
84be180e97f920a9400789368a6bc54c5a9b90d8':
Fix crash in getNativeCanvas when canvasHandle is NULL
Bo Liu [Tue, 25 Nov 2014 16:56:06 +0000 (16:56 +0000)]
Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev
John Reck [Tue, 25 Nov 2014 15:59:27 +0000 (15:59 +0000)]
am
fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev
* commit '
fb6121e069f25dd43e15b1377fe4d5f60c3d0dbe':
Revert "Ensure calling mutate() on DrawableContainer creates a new state"
Andres Morales [Mon, 24 Nov 2014 22:14:54 +0000 (14:14 -0800)]
Define permission for system apps to query size of block
Allows ManagedProvisioning to determine whether there's a
challenge and thus whether to disable NFC provisioning.
Other implementation option: new hidden boolean API method.
Can't think of benefit of new API method "isBlockInUse", other
than doesn't leak PDB size and is more explicitly tied to the
use case. Open to either impl if anyone has opinions on the matter.
Bug:
18508767
Change-Id: I28d2eb5a0837ff85cb91f140b17ce1dd843fe9d6
John Reck [Tue, 25 Nov 2014 15:54:23 +0000 (15:54 +0000)]
Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev
John Reck [Tue, 25 Nov 2014 15:50:59 +0000 (15:50 +0000)]
Revert "Ensure calling mutate() on DrawableContainer creates a new state"
This reverts commit
d7dab349c2af0e4bde188b1969f0c697b217dd57.
Change-Id: Icc1c4bfa296a59a551088fe7cc2449a97bb2b7b7
Reason: Broke the build
Robin Lee [Tue, 25 Nov 2014 13:40:49 +0000 (13:40 +0000)]
DevicePolicy: Don't warn about managed profile CAs
Setting up a managed profile should have included a step to warn about
this sort of thing already. As the user should trust the profile owner
anyway it's hard to argue this warning is needed.
Bug:
18224038
Change-Id: Ie86ba26851af726c0dec30eb9c32894ed6bb4a00
John Reck [Tue, 25 Nov 2014 15:38:24 +0000 (15:38 +0000)]
am
0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev
* commit '
0c31d97a38909e85e0df6cdc29469dbb1580ed4b':
Switch TextureCache to SkPixelRef::fStableId
John Reck [Tue, 25 Nov 2014 15:32:25 +0000 (15:32 +0000)]
Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev
Natalie Masse [Tue, 25 Nov 2014 11:27:32 +0000 (11:27 +0000)]
am
8d9e6434: am
65e51fcd: am
d7c7d275: am
77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit '
8d9e64343decaaf56a7d1fae5ed14ed172e9d7dd':
Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
Natalie Masse [Tue, 25 Nov 2014 11:22:05 +0000 (11:22 +0000)]
am
65e51fcd: am
d7c7d275: am
77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit '
65e51fcda25c33cdfa73e8ca3a4f71cf987bd0d2':
Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
Natalie Masse [Tue, 25 Nov 2014 11:15:24 +0000 (11:15 +0000)]
am
d7c7d275: am
77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit '
d7c7d275e77ffcae7498df7f75142e68e1b5123c':
Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
Natalie Masse [Tue, 25 Nov 2014 11:10:09 +0000 (11:10 +0000)]
am
77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit '
77283ec981fc022cd26ced1e44ad21cdc0b2e4ae':
Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
Natalie Masse [Tue, 25 Nov 2014 11:05:50 +0000 (11:05 +0000)]
Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
Svet Ganov [Tue, 25 Nov 2014 10:42:30 +0000 (10:42 +0000)]
am
f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev
* commit '
f51d7015df585b61d6a4f72f2327df7dcdec8899':
Lockup in the print spooler.
Svet Ganov [Tue, 25 Nov 2014 10:38:54 +0000 (10:38 +0000)]
Merge "Lockup in the print spooler." into lmp-mr1-dev
Dirk Dougherty [Tue, 25 Nov 2014 03:03:46 +0000 (03:03 +0000)]
am
5977f7d5: am
d23a8692: am
14e40f04: am
fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
* commit '
5977f7d52008f9b8dfc429acfde222a6e0afb2a2':
Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
Dirk Dougherty [Tue, 25 Nov 2014 02:58:25 +0000 (02:58 +0000)]
am
d23a8692: am
14e40f04: am
fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
* commit '
d23a8692ac96b7da73949d2dc4c549e73931609c':
Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
Dirk Dougherty [Tue, 25 Nov 2014 02:51:10 +0000 (02:51 +0000)]
am
14e40f04: am
fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
* commit '
14e40f042f17ae9e596ba6db7ff11c230796f193':
Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
Dirk Dougherty [Tue, 25 Nov 2014 02:20:36 +0000 (02:20 +0000)]
am
fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
* commit '
fd117ff2a4a8edd570ccaedd0cd769613ad4ef74':
Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
Dirk Dougherty [Fri, 21 Nov 2014 02:14:20 +0000 (18:14 -0800)]
Doc change: zh-cn translation of Android L overviews.
cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
Change-Id: Ic02b747917b11a88c2adf38a73c046dc32af6ce9
Alan Viverette [Tue, 25 Nov 2014 00:56:15 +0000 (00:56 +0000)]
am
ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev
* commit '
ada19e6de6bbad9a11a8db6ee44eb923709153b5':
Update action bar insets on sw600dp to match Material spec
Alan Viverette [Tue, 25 Nov 2014 00:56:10 +0000 (00:56 +0000)]
am
662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev
* commit '
662039c68768890d4f5a818067542be51e89255c':
Update IME selection dialog layout for Material
Alan Viverette [Tue, 25 Nov 2014 00:56:05 +0000 (00:56 +0000)]
am
d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev
* commit '
d30f6fba8ba15198a448d12d35e70872dcdf3589':
Cannot set Pivot X,Y values from setPivotX, setPivotY API
Adam Lesinski [Tue, 25 Nov 2014 00:56:00 +0000 (00:56 +0000)]
am
9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev
* commit '
9be305d146fb422a0e65e5284af2ce081cdc6a69':
Make the Context service constant for UsageStats public
Alan Viverette [Tue, 25 Nov 2014 00:55:55 +0000 (00:55 +0000)]
am
27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev
* commit '
27fdbc60736d2aced3fac01476851d6f130c392f':
Ensure calling mutate() on DrawableContainer creates a new state
Alan Viverette [Tue, 25 Nov 2014 00:55:49 +0000 (00:55 +0000)]
am
27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev
* commit '
27fbf67644bed5d0d590458ad89cee38d8fddeaa':
Update documentation for DatePicker to reflect the new mode
Alan Viverette [Tue, 25 Nov 2014 00:53:58 +0000 (00:53 +0000)]
Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev
Alan Viverette [Tue, 25 Nov 2014 00:53:42 +0000 (00:53 +0000)]
Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev
Alan Viverette [Tue, 25 Nov 2014 00:53:06 +0000 (00:53 +0000)]
Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev
Adam Lesinski [Tue, 25 Nov 2014 00:51:04 +0000 (00:51 +0000)]
Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev
Alan Viverette [Tue, 25 Nov 2014 00:50:53 +0000 (00:50 +0000)]
Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev
Alan Viverette [Tue, 25 Nov 2014 00:50:49 +0000 (00:50 +0000)]
Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev
John Reck [Mon, 24 Nov 2014 23:21:28 +0000 (15:21 -0800)]
Switch TextureCache to SkPixelRef::fStableId
Bug:
18245805
Change-Id: I08e6792dbeed86b13e569c7f2137de0e50dc2763
Alan Viverette [Mon, 24 Nov 2014 23:22:11 +0000 (15:22 -0800)]
Update IME selection dialog layout for Material
Also cleans up simple_list_item_2.xml formatting.
BUG:
18314215
Change-Id: I12b6ff19fca891524da7137b85dd576f85ee266a
Tom Taylor [Mon, 24 Nov 2014 23:20:11 +0000 (23:20 +0000)]
am
4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev
* commit '
4cd3e47e584fb1508db8f0e559f1167ab07c68c3':
Issues with messaging apps on non-primary user account
Ruben Brunk [Mon, 24 Nov 2014 23:16:03 +0000 (23:16 +0000)]
am
8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev
* commit '
8791a1e81a5a07b10b2be05fc6f3d94a71139c96':
Camera2: Ignore unsupported face detection results in LEGACY.
Tom Taylor [Mon, 24 Nov 2014 23:14:40 +0000 (23:14 +0000)]
Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev
Ruben Brunk [Mon, 24 Nov 2014 23:11:31 +0000 (23:11 +0000)]
Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev
Jeff Sharkey [Mon, 24 Nov 2014 23:10:01 +0000 (23:10 +0000)]
am
07aca15b: Merge "Better am error when SELinux blocking access." into lmp-mr1-dev
* commit '
07aca15b96806b48a46b9c92096a35d4443fa5dd':
Better am error when SELinux blocking access.
RoboErik [Mon, 24 Nov 2014 23:09:56 +0000 (23:09 +0000)]
am
d9bb296b: Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev
* commit '
d9bb296b56f1107674fd6370295e0bc1010848ba':
Delay calling onConnected until a session is set in MediaBrowser
Jeff Sharkey [Mon, 24 Nov 2014 23:05:06 +0000 (23:05 +0000)]
Merge "Better am error when SELinux blocking access." into lmp-mr1-dev
RoboErik [Mon, 24 Nov 2014 23:04:57 +0000 (23:04 +0000)]
Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev
Jeff Sharkey [Mon, 24 Nov 2014 22:45:40 +0000 (14:45 -0800)]
Better am error when SELinux blocking access.
Bug:
18479882
Change-Id: I0732e54838c4e04d9d727e7c5fd9d7e7bacbaa1f
Alan Viverette [Mon, 24 Nov 2014 22:37:46 +0000 (14:37 -0800)]
Update action bar insets on sw600dp to match Material spec
BUG:
18482784
Change-Id: Ic9dbca11e9fbf850ad017e1a4c7b72030bf35ddc
Jeff Sharkey [Mon, 24 Nov 2014 22:26:10 +0000 (22:26 +0000)]
am
0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev
* commit '
0f667f5855bff7432002dba2ef0d393fe2ad955f':
Ignore spammy package logs when dumping.
Jeff Sharkey [Mon, 24 Nov 2014 22:26:04 +0000 (22:26 +0000)]
am
7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev
* commit '
7038c39012c039aafcf4ac7931a087bfff42e125':
Move Documents action bar update even later.
Jeff Sharkey [Mon, 24 Nov 2014 22:21:23 +0000 (22:21 +0000)]
Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev
Jeff Sharkey [Mon, 24 Nov 2014 22:18:47 +0000 (22:18 +0000)]
Merge "Move Documents action bar update even later." into lmp-mr1-dev
Svet Ganov [Mon, 24 Nov 2014 10:01:37 +0000 (02:01 -0800)]
Lockup in the print spooler.
A recent change modified the way we destroy the remote renderer from
asynchronous to synchronous. This caused problems since it was possible
that the remote rendering service is unbound while we are reading the
contents of a rendered page. As a result the reader was blocking on I/O
and the print spooler was getting into a locked state that required a
restart of its process. Now the remote renderer is destroyed
asynchronously.
bug:
18498626
Change-Id: I1312bf808f30430728b4038dd4be43c55d2be825
Alan Viverette [Mon, 24 Nov 2014 22:07:24 +0000 (14:07 -0800)]
Update documentation for DatePicker to reflect the new mode
BUG:
18508605
Change-Id: I23d45bf1cd7783fa6f397c15f0ba6802e4069d6b
Alan Viverette [Mon, 24 Nov 2014 22:05:44 +0000 (22:05 +0000)]
am
760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev
* commit '
760cfb02de1e547b2823bf2b9621ef5b953cc5bd':
Check for null drawable in theme-less getDrawable()
Alan Viverette [Mon, 24 Nov 2014 21:57:49 +0000 (21:57 +0000)]
Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev
Adam Lesinski [Mon, 24 Nov 2014 19:27:50 +0000 (11:27 -0800)]
Make the Context service constant for UsageStats public
This was an oversight in L, where we did not make this
service constant public.
Change-Id: I42e38cb5ef8420cadc1a4a6705821189d911ccfe
Jean-Michel Trivi [Mon, 24 Nov 2014 21:44:21 +0000 (21:44 +0000)]
am
8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev
* commit '
8c81609616498b382d61d08371c547d644fa0709':
Add support for audio focus locking
Jeff Sharkey [Mon, 24 Nov 2014 21:43:45 +0000 (13:43 -0800)]
Ignore spammy package logs when dumping.
Bug:
18390552
Change-Id: Ie333f57d46d6ab3f4b9daa17f98b1e94a236e959
Jean-Michel Trivi [Mon, 24 Nov 2014 21:39:28 +0000 (21:39 +0000)]
Merge "Add support for audio focus locking" into lmp-mr1-dev
Jeff Davidson [Mon, 24 Nov 2014 21:25:41 +0000 (21:25 +0000)]
am
6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev
* commit '
6ea4e11d9817d85eb5c0ff445154985e4eb0c534':
Don't enforce control permission when preparing consented VPN.
Jinsuk Kim [Mon, 24 Nov 2014 21:21:12 +0000 (21:21 +0000)]
am
51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev
* commit '
51cb7aa774cf6ab7727928d136052c61325a8031':
CEC: Do not issue non-effective <Routing Change>
Jeff Davidson [Mon, 24 Nov 2014 21:19:55 +0000 (21:19 +0000)]
Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 21:15:28 +0000 (21:15 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Jinsuk Kim [Mon, 24 Nov 2014 21:13:58 +0000 (21:13 +0000)]
Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 20:49:28 +0000 (20:49 +0000)]
am
597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
597226d6f2adb3fd70d669e168a2d6171222ad1a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 20:44:48 +0000 (20:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
RoboErik [Fri, 21 Nov 2014 19:19:35 +0000 (11:19 -0800)]
Delay calling onConnected until a session is set in MediaBrowser
This will delay all calls to onConnected from the MediaBrowserService
until a session token has been set. This also requires making it an
exception to try setting the session twice.
bug:
18052336
Change-Id: Iecf186c53364183e1696af83a855c8db3294a5d0
Jeff Sharkey [Mon, 24 Nov 2014 20:20:10 +0000 (20:20 +0000)]
am
636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
* commit '
636baa0d2451a531f8e83f5cdfc0d709989c4862':
Introduce revision codes for split APKs.
Jeff Sharkey [Mon, 24 Nov 2014 18:00:00 +0000 (10:00 -0800)]
Move Documents action bar update even later.
At some point Activity started restoring the Toolbar/ActionBar title
during onPostCreate(), which would clobber some of the setup we just
finished doing. To fix, move our update to be even later in the
restore lifecycle.
Also fix grid item widths for small screen devices.
Bug:
17428127
Change-Id: I258121b6a6eec5924f92b02290a67d3ae7dd9cf6
Jeff Sharkey [Mon, 24 Nov 2014 20:16:12 +0000 (20:16 +0000)]
Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
Jeff Sharkey [Sun, 23 Nov 2014 00:49:34 +0000 (16:49 -0800)]
Introduce revision codes for split APKs.
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures. However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.
This change introduces "revision codes" which can vary between
split APKs belonging to the same app. An install is valid as long
as the normal version code is identical across all splits. Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.
Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version. Also fix bug to enable inheriting from system apps
when adding splits.
Bug:
18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
Sailesh Nepal [Mon, 24 Nov 2014 20:01:25 +0000 (20:01 +0000)]
am
0afd49a1: Merge "Add system API to get registered connection managers" into lmp-mr1-dev
* commit '
0afd49a1721a5fd71ecf69e6bc62cdb3c8591341':
Add system API to get registered connection managers
Jorim Jaggi [Mon, 24 Nov 2014 20:01:19 +0000 (20:01 +0000)]
am
6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
* commit '
6b77074438f191de4fcfa1f1560fb5f038cb8173':
Fix quick settings on Keyguard
Chris Wren [Mon, 24 Nov 2014 20:00:55 +0000 (20:00 +0000)]
am
1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev
* commit '
1b26cc5b7ab5733b94741f17c84eb4b140eaf045':
LED should not be blocked by interruption filtering.
smain@google.com [Mon, 24 Nov 2014 20:00:50 +0000 (20:00 +0000)]
am
79b496e8: am
75cd7c74: am
5f3ba993: am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
79b496e867f15529e442bbd19f6d0a75bf3f9f38':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
Sailesh Nepal [Mon, 24 Nov 2014 19:36:56 +0000 (19:36 +0000)]
Merge "Add system API to get registered connection managers" into lmp-mr1-dev
Jorim Jaggi [Mon, 24 Nov 2014 19:31:28 +0000 (19:31 +0000)]
Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
Jorim Jaggi [Fri, 21 Nov 2014 17:10:32 +0000 (18:10 +0100)]
Fix quick settings on Keyguard
- Fix that quick settings couldn't be scrolled nor closed on Keyguard
if scrolling was needed.
- Fix jumping in unlock motion when closing both panel and QS
- Fix invalid panel height when closing both QS and panel
Bug:
18481668
Change-Id: Ifd12e29bbc64f72f0dc13b43e36b1a57df7524fa
Geoff Mendal [Mon, 24 Nov 2014 19:28:36 +0000 (11:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia5a03d8dd7c8d82c4f65421b1b2985bdffceee19
Auto-generated-cl: translation import
Alan Viverette [Mon, 24 Nov 2014 19:27:09 +0000 (11:27 -0800)]
Check for null drawable in theme-less getDrawable()
BUG:
18507509
Change-Id: I64e2950dc3a30f3979ec179789a6f6e055c9f86d
Bo Liu [Mon, 24 Nov 2014 18:53:52 +0000 (10:53 -0800)]
Fix crash in getNativeCanvas when canvasHandle is NULL
BUG:
18261928
Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
Geoff Mendal [Mon, 24 Nov 2014 19:21:09 +0000 (11:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I753b271eb5b97b719fe6d4aa50d21431a961d553
Auto-generated-cl: translation import
Chris Wren [Mon, 24 Nov 2014 19:15:47 +0000 (19:15 +0000)]
Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev
Alan Viverette [Mon, 24 Nov 2014 19:11:05 +0000 (11:11 -0800)]
Ensure calling mutate() on DrawableContainer creates a new state
Previously, a new state would only be created on newDrawable(), which
caused the first drawable loaded for a resource to share constant state
with the cached version. Even if mutate() was called, the constant
state was still shared and any changes were applied to the cached copy.
BUG:
18504919
Change-Id: I1ce76fbbc144e9c0c93261e3a12cc613d0c74b83
smain@google.com [Mon, 24 Nov 2014 19:11:04 +0000 (19:11 +0000)]
am
75cd7c74: am
5f3ba993: am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
75cd7c74ab38a55914f1658234a0031c907eb3ed':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
smain@google.com [Mon, 24 Nov 2014 19:02:34 +0000 (19:02 +0000)]
am
5f3ba993: am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
5f3ba99376a7d01a4d142f2e34576202870b0a46':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
smain@google.com [Mon, 24 Nov 2014 18:55:57 +0000 (18:55 +0000)]
am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
1b23ee962a1ce0963537810724b2be61c0ab8c57':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.