125220 Commits

Author SHA1 Message Date
John Spurlock
3424c41e4e Merge "Move zen-mode systemui affordance to quick settings." 2014-03-12 23:06:00 +00:00
RoboErik
bc9160e634 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
2014-03-12 23:04:47 +00:00
RoboErik
f288eab6b0 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
2014-03-12 23:04:44 +00:00
Jeff Brown
088a997def 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.
2014-03-12 22:57:52 +00:00
Yohei Yukawa
de69575dd1 Merge "Preserve the order of InputMethodManager method calls" 2014-03-12 22:26:31 +00:00
John Reck
b7b9ca670d Merge "No-op isolatedZVolumen property" 2014-03-12 22:21:38 +00:00
RoboErik
4224e83642 Merge "Adds a TransportController and TransportPerformer to session" 2014-03-12 22:14:50 +00:00
John Reck
33896588e8 No-op isolatedZVolumen property
Change-Id: I7aa474d65a3d12efd4ffb731e07ee42f4d348183
2014-03-12 15:14:12 -07:00
RoboErik
8ae0f34db9 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
2014-03-12 15:09:42 -07:00
John Spurlock
d389ff7d89 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
2014-03-12 17:26:09 -04:00
RoboErik
bcb2839d57 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
2014-03-12 21:15:47 +00:00
RoboErik
515d25e799 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
2014-03-12 21:15:44 +00:00
RoboErik
306c46884e 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
2014-03-12 21:12:26 +00:00
RoboErik
840af707b3 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
2014-03-12 21:12:23 +00:00
John Reck
361fd3d2ff Merge "Rename DisplayList->RenderNode" 2014-03-12 21:03:03 +00:00
John Reck
e18264b079 Rename DisplayList->RenderNode
Change-Id: Id42e23c9a1a6eb6eaeafef707ced7fa6887b03d0
2014-03-12 13:56:30 -07:00
Jeff Brown
141d889166 am 578e1938: am 3ce589e5: am 2d8a3908: Fix power manager display wake lock bugs.
* commit '578e19381c2329511187083045d3ad5509428730':
  Fix power manager display wake lock bugs.
2014-03-12 20:34:48 +00:00
Jeff Brown
a8b65196d0 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)
2014-03-12 20:34:42 +00:00
RoboErik
ca9eef6203 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
2014-03-12 13:21:08 -07:00
RoboErik
c1e0015ec3 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
2014-03-12 13:20:57 -07:00
Fabrice Di Meglio
a7124cdd83 Merge "Cleanup ContextThemeWrapper" 2014-03-12 20:02:48 +00:00
Justin Koh
c8dbd29fc9 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.
2014-03-12 19:57:14 +00:00
Deepanshu Gupta
b552362bbc 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
2014-03-12 19:56:58 +00:00
Michael Wright
f0379bdfb7 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
2014-03-12 19:56:32 +00:00
Jeff Brown
81cc19cf18 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.
2014-03-12 19:22:44 +00:00
Chris Craik
0e6ad3b86b Merge "Force shadow casters above the Z=0 plane" 2014-03-12 19:22:28 +00:00
Jeff Brown
236e174a96 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.
2014-03-12 19:19:12 +00:00
Jeff Brown
0575b185c6 Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev 2014-03-12 19:16:42 +00:00
Chris Craik
b98f2116f5 Force shadow casters above the Z=0 plane
Change-Id: Ifee75414829d4bfb3c7aa6219f1f9bcfd50ff0c6
2014-03-12 11:19:42 -07:00
Mike Lockwood
5b568aa04a Merge "MTP: Add support for battery level device property" 2014-03-12 17:58:05 +00:00
Dan Sandler
a07605fcd7 Merge "Insulate SystemUI from IDs in inflated notification views." 2014-03-12 17:18:43 +00:00
Chris Craik
d84133af44 Merge "Fix orthographic shadows projection, simplify shadow reordering" 2014-03-12 17:03:01 +00:00
Chris Craik
b79a3e301a 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
2014-03-12 09:44:41 -07:00
Mike Lockwood
56c85244b9 MTP: Add support for battery level device property
Bug: 7342482

Change-Id: I810e55fe9695e2206816f57334ad14f65e9c641d
2014-03-12 08:46:47 -07:00
Jose Lima
9d50ea90f7 am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit 'c770e064effb79c33472f54652bd95aa14a8d6ec':
  Added LEANBACK_LAUNCHER Intent category
2014-03-12 15:19:37 +00:00
Robert Greenwalt
8d8b1b9cef 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
2014-03-12 15:19:33 +00:00
Zhihai Xu
f110416dcc 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.""
2014-03-12 15:19:30 +00:00
Vinit Deshapnde
fb403d5879 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
2014-03-12 15:19:27 +00:00
John Spurlock
f0b56b5805 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
2014-03-12 15:19:23 +00:00
Scott Main
d0f2c01c5f 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
2014-03-12 15:19:19 +00:00
Scott Main
8a1e3ac58c am 6fc25fb7: am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
* commit '6fc25fb727e788ea6f33e6cd8a0421750be2ef9a':
  fix typos
2014-03-12 15:19:14 +00:00
Neil Fuller
ad895779f8 Merge "Add APIs for better interoperability with Java 1.7" 2014-03-12 11:46:11 +00:00
Jeff Brown
578e19381c am 3ce589e5: am 2d8a3908: Fix power manager display wake lock bugs.
* commit '3ce589e59507193ce15a76fa135bf2efc7bca7c6':
  Fix power manager display wake lock bugs.
2014-03-12 09:03:17 +00:00
Jeff Brown
3ce589e595 am 2d8a3908: Fix power manager display wake lock bugs.
* commit '2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e':
  Fix power manager display wake lock bugs.
2014-03-12 08:57:51 +00:00
Jeff Brown
2d8a3908d2 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
2014-03-11 23:23:58 -07:00
Dan Sandler
6d94aa7a4e 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
2014-03-12 00:53:21 -04:00
Jeff Brown
1c65e293bd 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)
2014-03-12 04:05:24 +00:00
Jeff Brown
ec463b96e1 resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp
Change-Id: I0fa4486ed300a35de3af8748e01300b01f03ec01
2014-03-11 21:01:49 -07:00
Jeff Brown
e39ef09896 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
2014-03-11 20:56:26 -07:00
Jeff Brown
f08ea09fc0 Merge "Retain display when creating specialized contexts." 2014-03-12 03:43:17 +00:00