OSDN Git Service
Paul Lawrence [Thu, 6 Feb 2014 16:56:16 +0000 (08:56 -0800)]
Don't prompt at boot if we already did that when decrypting
vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.
Needs matching vold changes from
https://googleplex-android-review.git.corp.google.com/#/c/432050/
Bug:
12990752
Change-Id: I930ed8180cf0b8feb1e58db043d5fb6dff1bab20
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
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."
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: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"
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
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
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
Jeff Brown [Tue, 11 Mar 2014 04:24:37 +0000 (21:24 -0700)]
Retain display when creating specialized contexts. (DO NOT MERGE)
Fixed a bug that cause Context.createPackageContext() to discard
display information. Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.
As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.
Bug:
12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
Jeff Brown [Tue, 11 Mar 2014 04:24:37 +0000 (21:24 -0700)]
Retain display when creating specialized contexts.
Fixed a bug that cause Context.createPackageContext() to discard
display information. Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.
As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.
Bug:
12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
Justin Koh [Wed, 12 Mar 2014 00:49:44 +0000 (00:49 +0000)]
am
c48701a1: am
641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev
* commit '
c48701a134d3ba05e35d94da921abe1120b67185':
Fix possible invalid pointer index in swipe dismiss.
Justin Koh [Wed, 12 Mar 2014 00:47:20 +0000 (00:47 +0000)]
am
641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev
* commit '
641d8aff87cbb9ed5e84ce849e0da3d3962b5eb3':
Fix possible invalid pointer index in swipe dismiss.
Justin Koh [Wed, 12 Mar 2014 00:44:22 +0000 (00:44 +0000)]
Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev
Deepanshu Gupta [Tue, 11 Mar 2014 23:43:26 +0000 (23:43 +0000)]
am
f978f16e: resolved conflicts for merge of
c76345a3 to klp-modular-dev-plus-aosp
* commit '
f978f16e50374681b0ade2d14a5e39cedaea6c2f':
Fix the delegate method signatures in LayoutLib
Deepanshu Gupta [Tue, 11 Mar 2014 23:39:13 +0000 (16:39 -0700)]
resolved conflicts for merge of
c76345a3 to klp-modular-dev-plus-aosp
Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
Justin Koh [Thu, 6 Mar 2014 03:34:58 +0000 (19:34 -0800)]
Fix possible invalid pointer index in swipe dismiss.
Fix possible invalid pointer index in swipe dismiss: exit out if the pointer
index is -1. Also allow user to cancel this if in swipe mode.
Change-Id: I0f623ced0287679be8dd5c93ab6c67504b82fe9b
Michael Wright [Tue, 11 Mar 2014 23:26:39 +0000 (23:26 +0000)]
am
a54f852d: am
ed28fc89: Utilize new Android LED constants. DO NOT MERGE
* commit '
a54f852d3df7ac2e245ccffe8409b217330e5092':
Utilize new Android LED constants. DO NOT MERGE
Jose Lima [Tue, 11 Mar 2014 23:20:32 +0000 (23:20 +0000)]
am
dd0db799: am
5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit '
dd0db799ee25833a8989a823299f039ac31fef58':
Added LEANBACK_LAUNCHER Intent category
Robert Greenwalt [Tue, 11 Mar 2014 23:20:28 +0000 (23:20 +0000)]
am
ee142967: am
e5098b50: am
e8af5e10: am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
ee142967f60388d73c3bb99f321a781aa07f1eec':
DO NOT MERGE Debounce wifi country code Info
Zhihai Xu [Tue, 11 Mar 2014 23:20:25 +0000 (23:20 +0000)]
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 '
cb714ae68e3d1c0047fdb6980fabcafcd57b37b6':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Vinit Deshapnde [Tue, 11 Mar 2014 23:20:22 +0000 (23:20 +0000)]
am
dbba6f07: am
2e76f5d8: am
5f683ca8: am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
dbba6f076999afaad720c7c5657f7cbf9cdf2d14':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
John Spurlock [Tue, 11 Mar 2014 23:20:19 +0000 (23:20 +0000)]
am
b41c951f: am
cb5f813b: am
0a3cb2ce: am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
b41c951fb1b2a27d3278948f809e90a7c203ca4b':
Fix doc typos in Vibrator.java
Scott Main [Tue, 11 Mar 2014 23:20:16 +0000 (23:20 +0000)]
am
60d18cea: am
21207588: am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
60d18ceaf12ec24cea18d21121845dc4edcd5272':
fix some typos for GoogleApiClient doc
Scott Main [Tue, 11 Mar 2014 23:20:13 +0000 (23:20 +0000)]
am
a17a7000: am
2ada4e31: am
7b0c111b: am
69e49a81: Merge "fix typos" into klp-docs
* commit '
a17a7000f2e1c5d38694c6329a8efdcad48fe1d5':
fix typos
Michael Wright [Tue, 11 Mar 2014 23:16:25 +0000 (23:16 +0000)]
am
ed28fc89: Utilize new Android LED constants. DO NOT MERGE
* commit '
ed28fc89e3085a88c6bd8b4269988150f3eceb56':
Utilize new Android LED constants. DO NOT MERGE
Deepanshu Gupta [Tue, 11 Mar 2014 23:16:18 +0000 (16:16 -0700)]
am
792f38dd: Merge "Fix the delegate method signatures in LayoutLib"
* commit '
792f38ddd9e8d25b2c8bf0d67363dbfa56550636':
Fix the delegate method signatures in LayoutLib
Dianne Hackborn [Tue, 11 Mar 2014 22:59:20 +0000 (22:59 +0000)]
Merge "Reduce wake lock noise in battery history."
RoboErik [Tue, 11 Mar 2014 22:46:05 +0000 (22:46 +0000)]
Merge "Fix SDK build"
RoboErik [Tue, 11 Mar 2014 22:43:46 +0000 (15:43 -0700)]
Fix SDK build
Change-Id: I4bf73294cc9d970e17d1cddb840b53cc42155d14
Chris Craik [Tue, 11 Mar 2014 17:48:43 +0000 (10:48 -0700)]
Remove experimental perspective projection
Change-Id: Iad688c8395ccd4673cc129973802b5f01dfb45ba
Chris Craik [Tue, 11 Mar 2014 22:35:46 +0000 (22:35 +0000)]
Merge "Improve shadow tessellation performance"
Chris Craik [Sat, 8 Mar 2014 02:27:49 +0000 (18:27 -0800)]
Improve shadow tessellation performance
- Tune and simplify shadow parameters
- Remove additional inner rings
- Improve polygon ray casting algorithm
Change-Id: If0f28b2d66ae0480b675942bb65e8fcd2864425d
Michael Wright [Fri, 18 Oct 2013 22:26:48 +0000 (15:26 -0700)]
Utilize new Android LED constants. DO NOT MERGE
Also, have EventHub manage game controllers' player LEDs
Change-Id: Ic7dba19ad236a3c7d1aff5d3f938bd239b98d51d
Deepanshu Gupta [Tue, 11 Mar 2014 21:22:39 +0000 (21:22 +0000)]
Merge "Fix the delegate method signatures in LayoutLib"
Jose Lima [Tue, 11 Mar 2014 19:19:11 +0000 (19:19 +0000)]
am
5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit '
5f0c0498a1382ef955cccca95920ec878fe2a64c':
Added LEANBACK_LAUNCHER Intent category
Robert Greenwalt [Tue, 11 Mar 2014 19:19:07 +0000 (19:19 +0000)]
am
e5098b50: am
e8af5e10: am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
e5098b502c28d8f40ff3b39070fc5fb7f1a3e445':
DO NOT MERGE Debounce wifi country code Info
Zhihai Xu [Tue, 11 Mar 2014 19:19:05 +0000 (19:19 +0000)]
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 '
74f36d31892d8fdfddbecc7bf3018aa3a190e5fb':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Vinit Deshapnde [Tue, 11 Mar 2014 19:19:02 +0000 (19:19 +0000)]
am
2e76f5d8: am
5f683ca8: am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
2e76f5d8a282f4f948f88208e77dc4b3d0ec6634':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
John Spurlock [Tue, 11 Mar 2014 19:18:59 +0000 (19:18 +0000)]
am
cb5f813b: am
0a3cb2ce: am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
cb5f813bb642e72777643dcd2bcbd92cc2039388':
Fix doc typos in Vibrator.java
Scott Main [Tue, 11 Mar 2014 19:18:55 +0000 (19:18 +0000)]
am
21207588: am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
212075889eab9aab2c48881803888a1b827d77ba':
fix some typos for GoogleApiClient doc