OSDN Git Service
Baligh Uddin [Thu, 13 Mar 2014 16:24:37 +0000 (09:24 -0700)]
am
5468ae41: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
5468ae4125d8583982717ab7278207cb79dff9c6':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:24:35 +0000 (09:24 -0700)]
am
df385f2b: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
df385f2b4c897e140a7d8208641acc77d5e9a0c1':
Import translations. DO NOT MERGE
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:28:49 +0000 (05:28 -0700)]
am
68c9d259: Merge "EthernetDataTracker: Return proper interface name"
* commit '
68c9d2592cf492a37194522aa21ae01d6d7e1f4b':
EthernetDataTracker: Return proper interface name
Kenny Guy [Thu, 13 Mar 2014 12:28:45 +0000 (05:28 -0700)]
am
4979ff9f: Merge "Show notifications from related users."
* commit '
4979ff9f280727f15a0e4118426fbd4c3ba9cd31':
Show notifications from related users.
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."
Alexandra Gherghina [Thu, 13 Mar 2014 09:34:59 +0000 (02:34 -0700)]
am
aaebbbff: Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps."
* commit '
aaebbbff734cf65dcfd4489252948beca3d9225e':
Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps.
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."
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
John Reck [Thu, 13 Mar 2014 00:12:06 +0000 (17:12 -0700)]
am
e13cf570: Merge "Split out RenderProperties"
* commit '
e13cf5701529cd7229587b5546f4320f5b243368':
Split out RenderProperties
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:08:50 +0000 (16:08 -0700)]
am
3424c41e: Merge "Move zen-mode systemui affordance to quick settings."
* commit '
3424c41e4e775df79de42fc1ad6f177f0ac7bef2':
Move zen-mode systemui affordance to quick settings.
RoboErik [Wed, 12 Mar 2014 23:08:47 +0000 (16:08 -0700)]
am
bc9160e6: am
bcb2839d: (-s ours) am
306c4688: am
ca9eef62: b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
* commit '
bc9160e634ffc3360ba180bb47111d17289f8bc7':
b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
RoboErik [Wed, 12 Mar 2014 23:08:45 +0000 (16:08 -0700)]
am
f288eab6: am
515d25e7: (-s ours) am
840af707: am
c1e0015e: b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
* commit '
f288eab6b09d431f7760569fb055698bd2265cb5':
b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
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 23:03:20 +0000 (16:03 -0700)]
am
088a997d: am
81cc19cf: am
236e174a: am
0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
* commit '
088a997defe5ac88d10c341af277bceb7c46f479':
Add a temporary hack to report screen on while dozing.
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:28:39 +0000 (15:28 -0700)]
am
de69575d: Merge "Preserve the order of InputMethodManager method calls"
* commit '
de69575dd1bdafabda8afda8b4251b830ba0c551':
Preserve the order of InputMethodManager method calls
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:24:16 +0000 (15:24 -0700)]
am
b7b9ca67: Merge "No-op isolatedZVolumen property"
* commit '
b7b9ca670df2266a06a1902056482d1cc19635e3':
No-op isolatedZVolumen property
John Reck [Wed, 12 Mar 2014 22:21:38 +0000 (22:21 +0000)]
Merge "No-op isolatedZVolumen property"
RoboErik [Wed, 12 Mar 2014 22:17:27 +0000 (15:17 -0700)]
am
4224e836: Merge "Adds a TransportController and TransportPerformer to session"
* commit '
4224e836428391f77adaa14180ad558d12851208':
Adds a TransportController and TransportPerformer to session
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:05:10 +0000 (14:05 -0700)]
am
361fd3d2: Merge "Rename DisplayList->RenderNode"
* commit '
361fd3d2ff302d60a49ae2d2d1cc61cb5fdb0ece':
Rename DisplayList->RenderNode
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:38:29 +0000 (13:38 -0700)]
am
141d8891: am
578e1938: am
3ce589e5: am
2d8a3908: Fix power manager display wake lock bugs.
* commit '
141d88916647cada1c90448d5739a927fa508724':
Fix power manager display wake lock bugs.
Jeff Brown [Wed, 12 Mar 2014 20:38:26 +0000 (13:38 -0700)]
am
a8b65196: am
1c65e293: am
ec463b96: resolved conflicts for merge of
cc9894c8 to klp-modular-dev-plus-aosp
* commit '
a8b65196d0a7535f49aa7faa26a23afef272fac3':
Retain display when creating specialized contexts. (DO NOT MERGE)
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:07:34 +0000 (13:07 -0700)]
am
a7124cdd: Merge "Cleanup ContextThemeWrapper"
* commit '
a7124cdd83723027f5880fa96f0c285a7615f3fa':
Cleanup ContextThemeWrapper
Justin Koh [Wed, 12 Mar 2014 20:03:58 +0000 (13:03 -0700)]
am
c8dbd29f: am
c65caed6: am
c48701a1: am
641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev
* commit '
c8dbd29fc9b22ab0715dbe6181d53b24fa366332':
Fix possible invalid pointer index in swipe dismiss.
Deepanshu Gupta [Wed, 12 Mar 2014 20:03:55 +0000 (13:03 -0700)]
am
b552362b: am
c32a98b8: am
f978f16e: resolved conflicts for merge of
c76345a3 to klp-modular-dev-plus-aosp
* commit '
b552362bbc9001274f4022d8a494de6129f2723b':
Fix the delegate method signatures in LayoutLib
Michael Wright [Wed, 12 Mar 2014 20:03:52 +0000 (13:03 -0700)]
am
f0379bdf: am
81686bd9: (-s ours) am
a54f852d: am
ed28fc89: Utilize new Android LED constants. DO NOT MERGE
* commit '
f0379bdfb781a7d42121e88d5a528df8cd164b54':
Utilize new Android LED constants. DO NOT MERGE
Fabrice Di Meglio [Wed, 12 Mar 2014 20:02:47 +0000 (20:02 +0000)]
Merge "Cleanup ContextThemeWrapper"
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
Chris Craik [Wed, 12 Mar 2014 19:25:23 +0000 (12:25 -0700)]
am
0e6ad3b8: Merge "Force shadow casters above the Z=0 plane"
* commit '
0e6ad3b86bcf3d85b7a8b06c9f06344c94fd6222':
Force shadow casters above the Z=0 plane
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 18:01:19 +0000 (11:01 -0700)]
am
5b568aa0: Merge "MTP: Add support for battery level device property"
* commit '
5b568aa04a91786962af1ab372b5a62481eea8cc':
MTP: Add support for battery level device property
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:21:44 +0000 (10:21 -0700)]
am
a07605fc: Merge "Insulate SystemUI from IDs in inflated notification views."
* commit '
a07605fcd744740f7c82775de597ff8e8b4bd2d0':
Insulate SystemUI from IDs in inflated notification views.
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:05:18 +0000 (10:05 -0700)]
am
d84133af: Merge "Fix orthographic shadows projection, simplify shadow reordering"
* commit '
d84133af441caed8102b2da79cdb6f50673b80cb':
Fix orthographic shadows projection, simplify shadow reordering
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
Evan Charlton [Wed, 12 Mar 2014 16:22:56 +0000 (16:22 +0000)]
Merge "Fix the build (again)" into master-nova
Evan Charlton [Wed, 12 Mar 2014 16:21:40 +0000 (09:21 -0700)]
Fix the build (again)
Need a make clean first to get rid of deleted classes.
Change-Id: I92ae86d40a5e20296bbbf594850ea2d6a2dd3b3e
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:22:52 +0000 (08:22 -0700)]
am
9d50ea90: am
c770e064: am
dd0db799: am
5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit '
9d50ea90f7072a7fa87d022663f2d25b906ed2ad':
Added LEANBACK_LAUNCHER Intent category
Robert Greenwalt [Wed, 12 Mar 2014 15:22:49 +0000 (08:22 -0700)]
am
8d8b1b9c: 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 '
8d8b1b9cefe9b17b40cf028c7c7533fb6ffb7a51':
DO NOT MERGE Debounce wifi country code Info
Zhihai Xu [Wed, 12 Mar 2014 15:22:47 +0000 (08:22 -0700)]
am
f110416d: 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 '
f110416dcc7fd34ee183c5ae70761a14ab188a05':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Vinit Deshapnde [Wed, 12 Mar 2014 15:22:44 +0000 (08:22 -0700)]
am
fb403d58: 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 '
fb403d587906a315ae3ca5ce1958d9d9637777f6':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
John Spurlock [Wed, 12 Mar 2014 15:22:40 +0000 (08:22 -0700)]
am
f0b56b58: am
2fcac8ba: am
b41c951f: am
cb5f813b: am
0a3cb2ce: am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
f0b56b580579c63caaa4d775231ccbad65b61af5':
Fix doc typos in Vibrator.java
Scott Main [Wed, 12 Mar 2014 15:22:37 +0000 (08:22 -0700)]
am
d0f2c01c: am
41b60030: am
60d18cea: am
21207588: am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
d0f2c01c5f081099f47c5efd8f2358df681071b8':
fix some typos for GoogleApiClient doc
Scott Main [Wed, 12 Mar 2014 15:22:34 +0000 (08:22 -0700)]
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)]
Evan Charlton [Wed, 12 Mar 2014 14:29:58 +0000 (07:29 -0700)]
Fix the build (update API)
There was a last-minute renaming of some constants and update-api was
not re-run.
Change-Id: I3278cc204ea9e03ab3d5400cd308abedbf3b6da8
Neil Fuller [Wed, 12 Mar 2014 12:23:42 +0000 (05:23 -0700)]
am
ad895779: Merge "Add APIs for better interoperability with Java 1.7"
* commit '
ad895779f8b8d63832a4195e4e895641985f97ad':
Add APIs for better interoperability with Java 1.7
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
Jeff Brown [Wed, 12 Mar 2014 03:56:26 +0000 (20:56 -0700)]
Add a temporary hack to report screen on while dozing.
The window manager and view hierarchy currently disable all drawing
when PowerManager.isScreenOn() returns false so no drawing occurs
while dozing. This will be fixed in a future patch to take the
display blanking state into account correctly.
This patch is a workaround to unblock development in the meantime.
Bug:
13133142
Change-Id: I2dc0b422c77285e657d73adca2606aa68264d987
Sailesh Nepal [Wed, 12 Mar 2014 03:54:48 +0000 (03:54 +0000)]
Merge "Fix build break due to links to private APIs" into master-nova
Jeff Brown [Wed, 12 Mar 2014 03:45:19 +0000 (20:45 -0700)]
am
f08ea09f: Merge "Retain display when creating specialized contexts."
* commit '
f08ea09fc0d85a60dbd270fbb80ea93127356554':
Retain display when creating specialized contexts.
Sailesh Nepal [Wed, 12 Mar 2014 03:44:22 +0000 (20:44 -0700)]
Fix build break due to links to private APIs
Change-Id: I22360bd93800e1d898becb9fee9312acf82b78c7
Jeff Brown [Wed, 12 Mar 2014 03:43:17 +0000 (03:43 +0000)]
Merge "Retain display when creating specialized contexts."
Jeff Brown [Wed, 12 Mar 2014 03:42:20 +0000 (03:42 +0000)]
Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-modular-dev