OSDN Git Service
Jason Sams [Fri, 14 Mar 2014 00:22:45 +0000 (00:22 +0000)]
am
440613f5: am
276565c8: am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
440613f5c35577f9a5bbc087b2e306e37bb8f94e':
Force merge of remaining KLP changes to fix build.
Jason Sams [Thu, 13 Mar 2014 23:12:01 +0000 (23:12 +0000)]
am
21f97de0: am
35a9e339: am
fc15f899: Fix build issues from bad merge
* commit '
21f97de0bc4871cd8759aa8edbf55eb97d4a6ff2':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 23:11:58 +0000 (23:11 +0000)]
am
4a268aff: am
534606b4: am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
4a268affbf2a15d68171036a941c2404eae07833':
Fix destruction issues relating to AllocationAdapter.
Mike Lockwood [Thu, 13 Mar 2014 22:25:08 +0000 (22:25 +0000)]
Merge "MTP: Add support for some audio specific object properties"
Mike Lockwood [Thu, 13 Mar 2014 21:51:29 +0000 (14:51 -0700)]
MTP: Add support for some audio specific object properties
This stops Windows 7 from putting up the
"Your device might not be able to play or view this file" dialog
when copying MP3 files to the device.
Bug:
3195286
Change-Id: Ic5b3fb75309893caae1a4f4b56068a543847f1f7
Hui Shu [Thu, 13 Mar 2014 22:11:40 +0000 (22:11 +0000)]
Merge "Add removeApi commandline option for doclava and an empty removed.txt"
John Reck [Thu, 13 Mar 2014 22:06:23 +0000 (22:06 +0000)]
Merge "App compat"
John Reck [Thu, 13 Mar 2014 21:53:13 +0000 (14:53 -0700)]
App compat
Bug:
13450310
Change-Id: I32d948a243385d1bb9f2615759127f4b13ce01bd
Maxim Siniavine [Thu, 13 Mar 2014 21:29:45 +0000 (21:29 +0000)]
Merge "Fixes for download manager test."
John Spurlock [Thu, 13 Mar 2014 21:26:35 +0000 (21:26 +0000)]
Merge "Add more information to existing notification_* events."
Jason Sams [Thu, 13 Mar 2014 21:20:35 +0000 (21:20 +0000)]
am
457c9554: am
2ffcffd0: am
280db650: am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
457c9554766f8c0645c53e2317bb024ad28797fa':
Add hidden minor version ID for support lib workarounds.
Jason Sams [Thu, 13 Mar 2014 21:20:31 +0000 (21:20 +0000)]
am
abe8dfb0: am
0641a5d4: am
7f8a4107: am
0165db38: (-s ours) am
ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '
abe8dfb0e37284395b36420ed62f1a93b99bdaf2':
Fix destruction issues relating to AllocationAdapter.
Michael Wright [Thu, 13 Mar 2014 21:20:12 +0000 (21:20 +0000)]
am
444b0c6b: (-s ours) am
f80f60ba: am
d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev
* commit '
444b0c6b72bf508e3a672fe34d0f4b00cfea19f9':
Controllers must have buttons and a movement mechanism.
Ruben Brunk [Thu, 13 Mar 2014 20:18:36 +0000 (20:18 +0000)]
Merge "camera3: Pass vendor tags through binder."
Ruben Brunk [Sat, 22 Feb 2014 01:40:51 +0000 (17:40 -0800)]
camera3: Pass vendor tags through binder.
Bug:
12134423
Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
John Spurlock [Thu, 13 Mar 2014 16:29:00 +0000 (12:29 -0400)]
Add more information to existing notification_* events.
Include calling UID/PID in the existing
notification_{enqueue/cancel/cancel_all} event logs.
Include a new "reason" arg for cancel + cancel_all to
identify listener vs noman vs statusbarmgr calls.
Found and fixed a cancelAll path (from statusbarmgr)
that was not logging at all.
Bug:
13442201
Change-Id: I2e1f875076a96b1fe3b86e8990641efb1cadfcfb
Craig Mautner [Sat, 8 Mar 2014 22:23:10 +0000 (14:23 -0800)]
Add Lock Task Mode.
When in lock task mode only the specified task may run. All
attempts to switch to another task are ignored until the task
finishes or a call to stopLockTaskMode() is made.
Change-Id: I6cfe92fe1bcf22cd47b5398c08e23c52a4092dda
Jason Sams [Thu, 13 Mar 2014 18:08:31 +0000 (18:08 +0000)]
am
276565c8: am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
276565c83c05e24819454dea4008ad5096792e4f':
Force merge of remaining KLP changes to fix build.
Jason Sams [Thu, 13 Mar 2014 18:02:03 +0000 (18:02 +0000)]
am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
0ebc6b378dca76b3253b10cf17c3a38a0a50c073':
Force merge of remaining KLP changes to fix build.
Mike Lockwood [Thu, 13 Mar 2014 17:58:33 +0000 (17:58 +0000)]
Merge "USB: Add support for disabling USB permission dialogs."
Mike Lockwood [Thu, 13 Mar 2014 17:26:53 +0000 (10:26 -0700)]
USB: Add support for disabling USB permission dialogs.
Setting scom.android.internal.R.bool.config_disableUsbPermissionDialogs to true
will disable all USB permission dialogs, allowing apps access to USB devices
and accessories by default.
For prototyping purposes only. This should not be used in real devices.
Bug:
13437578
Change-Id: Ie7bf83882943930b15e5f1edb3044a4a52034273
Dianne Hackborn [Thu, 13 Mar 2014 17:04:54 +0000 (17:04 +0000)]
Merge "Fix some uid issues in battery stats."
Dianne Hackborn [Thu, 13 Mar 2014 16:50:24 +0000 (09:50 -0700)]
Fix some uid issues in battery stats.
Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
Baligh Uddin [Thu, 13 Mar 2014 16:22:48 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 13 Mar 2014 16:22:44 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Jaewan Kim [Thu, 13 Mar 2014 12:07:35 +0000 (12:07 +0000)]
Merge "EthernetDataTracker: Return proper interface name"
Kenny Guy [Thu, 13 Mar 2014 11:57:54 +0000 (11:57 +0000)]
Merge "Show notifications from related users."
Jason Sams [Thu, 13 Mar 2014 10:53:01 +0000 (10:53 +0000)]
am
35a9e339: am
fc15f899: Fix build issues from bad merge
* commit '
35a9e339687a0c5423c3433ff0c335ad9e1e0656':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 10:52:56 +0000 (10:52 +0000)]
am
534606b4: am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
534606b44a865874b00fba24517a8e218ec56075':
Fix destruction issues relating to AllocationAdapter.
Jason Sams [Thu, 13 Mar 2014 10:50:19 +0000 (10:50 +0000)]
am
fc15f899: Fix build issues from bad merge
* commit '
fc15f899b86aa39bd32e3d38a9f5369ee8f0e2c8':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 10:50:15 +0000 (10:50 +0000)]
am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
632c915ce8675033bbb7d356239d16594b26dffb':
Fix destruction issues relating to AllocationAdapter.
Alexandra Gherghina [Thu, 13 Mar 2014 09:31:53 +0000 (09:31 +0000)]
Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps."
Jason Sams [Thu, 13 Mar 2014 09:28:22 +0000 (09:28 +0000)]
am
2ffcffd0: am
280db650: am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
2ffcffd046e321b871a04480552cef6ee4735e62':
Add hidden minor version ID for support lib workarounds.
Jason Sams [Thu, 13 Mar 2014 09:28:19 +0000 (09:28 +0000)]
am
0641a5d4: am
7f8a4107: am
0165db38: (-s ours) am
ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '
0641a5d4b1a3b0675c36f44adb05d0a5e20c3d56':
Fix destruction issues relating to AllocationAdapter.
Jason Sams [Thu, 13 Mar 2014 09:12:14 +0000 (09:12 +0000)]
am
280db650: am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
280db65032fe0ed6897bc33c627ae176daecb1c2':
Add hidden minor version ID for support lib workarounds.
Jason Sams [Thu, 13 Mar 2014 09:12:09 +0000 (09:12 +0000)]
am
7f8a4107: am
0165db38: (-s ours) am
ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '
7f8a41079c342ff1f4f0ba3bf8e4f4e203da2649':
Fix destruction issues relating to AllocationAdapter.
Alexandra Gherghina [Wed, 12 Mar 2014 19:15:26 +0000 (19:15 +0000)]
Check for empty activity stack. This avoids a null pointer exception
when switching from an user with no open apps.
Change-Id: I02629818f2bc82ee3a2825cf484ef1e32e3e6067
Jason Sams [Thu, 13 Mar 2014 08:49:05 +0000 (01:49 -0700)]
Force merge of remaining KLP changes to fix build.
Change-Id: I389a23c6615663c325980fcb30350ea6635d2d17
Jason Sams [Thu, 13 Mar 2014 08:17:49 +0000 (01:17 -0700)]
Fix build issues from bad merge
Change-Id: I6ebac7c87b807a8ed2fbeac895c1db8b199f715a
Jason Sams [Thu, 13 Mar 2014 07:39:04 +0000 (00:39 -0700)]
resolved conflicts for merge of
780d57b8 to klp-modular-dev
Change-Id: Idf2f939c25c342fff98da6b83be875d7708deba0
Jason Sams [Thu, 13 Mar 2014 01:35:42 +0000 (01:35 +0000)]
am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
e14d5e901172559a5e18077bde3ccafd03e8a6e2':
Add hidden minor version ID for support lib workarounds.
Jason Sams [Thu, 13 Mar 2014 01:35:38 +0000 (01:35 +0000)]
am
0165db38: (-s ours) am
ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '
0165db3802f0fafe0ad86b7699be7adaea6686da':
Fix destruction issues relating to AllocationAdapter.
Maxim Siniavine [Wed, 12 Mar 2014 23:45:17 +0000 (16:45 -0700)]
Fixes for download manager test.
When checking that the download is in progress, check the number number
of bytes downloaded as reported by download manager, rather than looking at the file size.
When waiting for the download to complete rely on the received broadcast.
Bug:
13326931
Change-Id: I4c2431dd71e17602e758bc482be185683040ea98
Michael Wright [Thu, 13 Mar 2014 00:42:43 +0000 (00:42 +0000)]
am
f80f60ba: am
d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev
* commit '
f80f60ba2b61df9f9544fcae8d8bdbe5542269fc':
Controllers must have buttons and a movement mechanism.
Michael Wright [Thu, 13 Mar 2014 00:40:03 +0000 (00:40 +0000)]
am
d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev
* commit '
d23d916e0fc573ccde8a622aaa42ccfae9d31f82':
Controllers must have buttons and a movement mechanism.
Michael Wright [Thu, 13 Mar 2014 00:37:10 +0000 (00:37 +0000)]
Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev
John Reck [Thu, 13 Mar 2014 00:09:11 +0000 (00:09 +0000)]
Merge "Split out RenderProperties"
John Reck [Wed, 12 Mar 2014 23:11:23 +0000 (16:11 -0700)]
Split out RenderProperties
Change-Id: Ia9888b4fb2c849d95a8c395cafef2e2294a23aae
John Spurlock [Wed, 12 Mar 2014 23:05:58 +0000 (23:05 +0000)]
Merge "Move zen-mode systemui affordance to quick settings."
RoboErik [Wed, 12 Mar 2014 23:04:47 +0000 (23:04 +0000)]
am
bcb2839d: (-s ours) am
306c4688: am
ca9eef62: b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
* commit '
bcb2839d576f1e91f0085d09c2b279d03053910f':
b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
RoboErik [Wed, 12 Mar 2014 23:04:44 +0000 (23:04 +0000)]
am
515d25e7: (-s ours) am
840af707: am
c1e0015e: b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
* commit '
515d25e79991db17c56244e7b7654f7e8bcbf3c9':
b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
Jeff Brown [Wed, 12 Mar 2014 22:57:52 +0000 (22:57 +0000)]
am
81cc19cf: am
236e174a: am
0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
* commit '
81cc19cf18dff969319c7d1ded4f285394e37aab':
Add a temporary hack to report screen on while dozing.
Yohei Yukawa [Wed, 12 Mar 2014 22:26:31 +0000 (22:26 +0000)]
Merge "Preserve the order of InputMethodManager method calls"
John Reck [Wed, 12 Mar 2014 22:21:38 +0000 (22:21 +0000)]
Merge "No-op isolatedZVolumen property"
RoboErik [Wed, 12 Mar 2014 22:14:50 +0000 (22:14 +0000)]
Merge "Adds a TransportController and TransportPerformer to session"
John Reck [Wed, 12 Mar 2014 22:14:12 +0000 (15:14 -0700)]
No-op isolatedZVolumen property
Change-Id: I7aa474d65a3d12efd4ffb731e07ee42f4d348183
RoboErik [Tue, 25 Feb 2014 02:02:08 +0000 (18:02 -0800)]
Adds a TransportController and TransportPerformer to session
This makes transport controls a primitive interface on sessions with
a way to create the performer, register callbacks, and send commands
and updates between controllers and performers. This still needs some
cleanup but has been tested with OneMedia.
Change-Id: I373d35f7ccc383b8421bd14044457467d80425f3
John Spurlock [Wed, 12 Mar 2014 18:54:28 +0000 (14:54 -0400)]
Move zen-mode systemui affordance to quick settings.
Remove the gesture-based invocation from the notifcation
panel, create a new QS tile to display current state.
Clicking the tile reveals an interstitial dialog for
confirmation of mode changes.
Change-Id: I6760ce3f097d5dcfd0af5177287dbf4ff632b47e
RoboErik [Wed, 12 Mar 2014 21:15:47 +0000 (21:15 +0000)]
am
306c4688: am
ca9eef62: b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
* commit '
306c46884eb3121a981a0d1ed0c5461908c227fc':
b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
RoboErik [Wed, 12 Mar 2014 21:15:44 +0000 (21:15 +0000)]
am
840af707: am
c1e0015e: b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
* commit '
840af707b38cf2177cf546e460899fa2d3da335a':
b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
RoboErik [Wed, 12 Mar 2014 21:12:26 +0000 (21:12 +0000)]
am
ca9eef62: b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
* commit '
ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd':
b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
RoboErik [Wed, 12 Mar 2014 21:12:23 +0000 (21:12 +0000)]
am
c1e0015e: b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
* commit '
c1e0015ec3dfacc137cb500066020b25f18ecbb7':
b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
John Reck [Wed, 12 Mar 2014 21:03:03 +0000 (21:03 +0000)]
Merge "Rename DisplayList->RenderNode"
John Reck [Wed, 12 Mar 2014 20:56:30 +0000 (13:56 -0700)]
Rename DisplayList->RenderNode
Change-Id: Id42e23c9a1a6eb6eaeafef707ced7fa6887b03d0
Jeff Brown [Wed, 12 Mar 2014 20:34:48 +0000 (20:34 +0000)]
am
578e1938: am
3ce589e5: am
2d8a3908: Fix power manager display wake lock bugs.
* commit '
578e19381c2329511187083045d3ad5509428730':
Fix power manager display wake lock bugs.
Jeff Brown [Wed, 12 Mar 2014 20:34:42 +0000 (20:34 +0000)]
am
1c65e293: am
ec463b96: resolved conflicts for merge of
cc9894c8 to klp-modular-dev-plus-aosp
* commit '
1c65e293bd9646e8ca0dd6447c0bcb0889305273':
Retain display when creating specialized contexts. (DO NOT MERGE)
RoboErik [Mon, 16 Dec 2013 19:27:55 +0000 (11:27 -0800)]
b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/
Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.
There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.
Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
RoboErik [Thu, 12 Dec 2013 01:02:46 +0000 (17:02 -0800)]
b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
Cherry pick from https://googleplex-android-review.git.corp.google.com/#/c/398226/
This adds an integer to the descriptor of devices without uniqely
identifying information. It will reuse values that are no longer
in use, so if you remove a single device and attach a different
identical device it will appear to be the same device.
TODO: Derive uniqueness from USB port when possible. This version
will generate different descriptors for each half of a USB keyboard
that shows up twice.
Change-Id: Ie628f19c01469f6ec2d354cd00000898ac6432fa
Fabrice Di Meglio [Wed, 12 Mar 2014 20:02:47 +0000 (20:02 +0000)]
Merge "Cleanup ContextThemeWrapper"
Michael Wright [Wed, 12 Mar 2014 19:56:51 +0000 (12:56 -0700)]
Controllers must have buttons and a movement mechanism.
Some devices have joystick axes or DPad keys, but no gamepad buttons
(or vice versa). We shouldn't count these as gamepads since games
can't really be expected to work with this setup in the general case.
Instead, require that a device has a movement mechanism (joystick
axes or DPad buttons), as well as at least one gamepad button before
considering it a controller.
Bug:
13432364
Change-Id: Ia113c8441557d4c858c1e5740a3e1c7e0e9fdcdd
Justin Koh [Wed, 12 Mar 2014 19:57:14 +0000 (19:57 +0000)]
am
c65caed6: am
c48701a1: am
641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev
* commit '
c65caed6dabe9eed3551c412427df81cd881496a':
Fix possible invalid pointer index in swipe dismiss.
Deepanshu Gupta [Wed, 12 Mar 2014 19:56:58 +0000 (19:56 +0000)]
am
c32a98b8: am
f978f16e: resolved conflicts for merge of
c76345a3 to klp-modular-dev-plus-aosp
* commit '
c32a98b8cc09687a031ed969e39df593bf483459':
Fix the delegate method signatures in LayoutLib
Michael Wright [Wed, 12 Mar 2014 19:56:32 +0000 (19:56 +0000)]
am
81686bd9: (-s ours) am
a54f852d: am
ed28fc89: Utilize new Android LED constants. DO NOT MERGE
* commit '
81686bd93c15f0129de27e1b2a2e025e0b4112b4':
Utilize new Android LED constants. DO NOT MERGE
Kenny Guy [Mon, 3 Mar 2014 18:24:03 +0000 (18:24 +0000)]
Show notifications from related users.
When filtering notifications for user include those for users that
are related to the current user.
Pipe through user id so we know which user the notification is for.
Change-Id: I4e2657c23bd7b611d450be5a1f9457824bc062cb
Jeff Brown [Wed, 12 Mar 2014 19:22:44 +0000 (19:22 +0000)]
am
236e174a: am
0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
* commit '
236e174a96e73e5ae189285d984e3091210c762b':
Add a temporary hack to report screen on while dozing.
Chris Craik [Wed, 12 Mar 2014 19:22:28 +0000 (19:22 +0000)]
Merge "Force shadow casters above the Z=0 plane"
Jeff Brown [Wed, 12 Mar 2014 19:19:12 +0000 (19:19 +0000)]
am
0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
* commit '
0575b185c618a79ede771389ed9a78436b5636bd':
Add a temporary hack to report screen on while dozing.
Jeff Brown [Wed, 12 Mar 2014 19:16:42 +0000 (19:16 +0000)]
Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
Chris Craik [Wed, 12 Mar 2014 00:42:29 +0000 (17:42 -0700)]
Force shadow casters above the Z=0 plane
Change-Id: Ifee75414829d4bfb3c7aa6219f1f9bcfd50ff0c6
Mike Lockwood [Wed, 12 Mar 2014 17:58:04 +0000 (17:58 +0000)]
Merge "MTP: Add support for battery level device property"
Dan Sandler [Wed, 12 Mar 2014 17:18:42 +0000 (17:18 +0000)]
Merge "Insulate SystemUI from IDs in inflated notification views."
Chris Craik [Wed, 12 Mar 2014 17:03:00 +0000 (17:03 +0000)]
Merge "Fix orthographic shadows projection, simplify shadow reordering"
Baligh Uddin [Wed, 12 Mar 2014 16:48:44 +0000 (09:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3d7d91a2d618011ef9c0b7f746e76f9f4de16afc
Auto-generated-cl: translation import
Chris Craik [Tue, 11 Mar 2014 19:20:17 +0000 (12:20 -0700)]
Fix orthographic shadows projection, simplify shadow reordering
Separate matrix passed to shadow system into two parts, one for
transforming the polygon XY points (using the actual draw matrix) and
a separate one which respects correct 4x4 3d rotations and
translations for determining Z values.
Change-Id: I7e30a84774a8709df6b2241e8f51fc5583648fe8
Baligh Uddin [Wed, 12 Mar 2014 16:38:40 +0000 (09:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I053b8340554822937b9d6927f4b621f2ee982489
Auto-generated-cl: translation import
Mike Lockwood [Fri, 7 Mar 2014 21:29:08 +0000 (13:29 -0800)]
MTP: Add support for battery level device property
Bug:
7342482
Change-Id: I810e55fe9695e2206816f57334ad14f65e9c641d
Jose Lima [Wed, 12 Mar 2014 15:19:37 +0000 (15:19 +0000)]
am
c770e064: am
dd0db799: am
5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit '
c770e064effb79c33472f54652bd95aa14a8d6ec':
Added LEANBACK_LAUNCHER Intent category
Robert Greenwalt [Wed, 12 Mar 2014 15:19:33 +0000 (15:19 +0000)]
am
31734c35: (-s ours) am
ee142967: am
e5098b50: am
e8af5e10: am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
31734c35bf3ebcbeaa14721aefd51df11c796345':
DO NOT MERGE Debounce wifi country code Info
Zhihai Xu [Wed, 12 Mar 2014 15:19:30 +0000 (15:19 +0000)]
am
42703d11: (-s ours) am
cb714ae6: am
74f36d31: am
c48c9626: am
82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '
42703d1199ea4770f505db0d5d8c9eb7d076e0d4':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Vinit Deshapnde [Wed, 12 Mar 2014 15:19:27 +0000 (15:19 +0000)]
am
58795020: (-s ours) am
dbba6f07: am
2e76f5d8: am
5f683ca8: am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
58795020ef98789f5c5b942417ad0f23b6771221':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
John Spurlock [Wed, 12 Mar 2014 15:19:23 +0000 (15:19 +0000)]
am
2fcac8ba: am
b41c951f: am
cb5f813b: am
0a3cb2ce: am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
2fcac8ba6fe870d78eca7b75c0e846a229f08819':
Fix doc typos in Vibrator.java
Scott Main [Wed, 12 Mar 2014 15:19:19 +0000 (15:19 +0000)]
am
41b60030: am
60d18cea: am
21207588: am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
41b600304e6a2d007711ec814647e4dddbdd96ca':
fix some typos for GoogleApiClient doc
Scott Main [Wed, 12 Mar 2014 15:19:14 +0000 (15:19 +0000)]
Neil Fuller [Wed, 12 Mar 2014 11:46:10 +0000 (11:46 +0000)]
Merge "Add APIs for better interoperability with Java 1.7"
Jeff Brown [Wed, 12 Mar 2014 09:03:17 +0000 (09:03 +0000)]
am
3ce589e5: am
2d8a3908: Fix power manager display wake lock bugs.
* commit '
3ce589e59507193ce15a76fa135bf2efc7bca7c6':
Fix power manager display wake lock bugs.
Jeff Brown [Wed, 12 Mar 2014 08:57:51 +0000 (08:57 +0000)]
am
2d8a3908: Fix power manager display wake lock bugs.
* commit '
2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e':
Fix power manager display wake lock bugs.
Jeff Brown [Wed, 12 Mar 2014 06:02:35 +0000 (23:02 -0700)]
Fix power manager display wake lock bugs.
Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.
1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.
2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on. This could happen when the display was
rapidly turned on-off-on-off.
Bug:
13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
Dan Sandler [Wed, 12 Mar 2014 04:53:21 +0000 (00:53 -0400)]
Insulate SystemUI from IDs in inflated notification views.
We use the hidden View.setIsRootNamespace() in the same way
that AppWidgetHostView does: to block recursive ID search
traversals from traveling into notification views, which
might have children with IDs that collide with SystemUI's
own views. (Views inside notifications can still be located
by ID, but you need to start your search inside the
inflated notification row.)
Bug:
13421971
Change-Id: If8b81b9d0ed4b0eb6fa1e028275caa0b932f5759
Jeff Brown [Wed, 12 Mar 2014 04:05:24 +0000 (04:05 +0000)]
am
ec463b96: resolved conflicts for merge of
cc9894c8 to klp-modular-dev-plus-aosp
* commit '
ec463b96e188f2c68cbef2362e570118a3a460ed':
Retain display when creating specialized contexts. (DO NOT MERGE)
Jeff Brown [Wed, 12 Mar 2014 04:01:49 +0000 (21:01 -0700)]
resolved conflicts for merge of
cc9894c8 to klp-modular-dev-plus-aosp
Change-Id: I0fa4486ed300a35de3af8748e01300b01f03ec01