OSDN Git Service
Christopher Tate [Thu, 13 Mar 2014 18:08:49 +0000 (18:08 +0000)]
am
d5b25cbd: am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
d5b25cbd570680c361da8807fdfddf135472d338':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 18:08:46 +0000 (18:08 +0000)]
am
c48e3d03: (-s ours) am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c48e3d03436bd428ef5425114ea138ae097f1f20':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:08:43 +0000 (18:08 +0000)]
am
d7cc4bf4: am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
d7cc4bf482d69d146eb5386b790816c8a46f278a':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 18:08:40 +0000 (18:08 +0000)]
am
839321a3: am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
839321a362ec1cd40fc7267a7883641bcc8ee429':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 18:08:37 +0000 (18:08 +0000)]
am
ba3d0fd5: am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
ba3d0fd5fc520d1a6dcf6e6abc5f9d90c08e9f88':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 18:08:34 +0000 (18:08 +0000)]
am
4a5c9e94: am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
4a5c9e941a78299d869b4c9d916fd86187057150':
Fix a bug in submenu presenter priority handling
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.
Christopher Tate [Thu, 13 Mar 2014 18:02:45 +0000 (18:02 +0000)]
am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
aaaeb6a21bb6cc540fefa6868493bda612a63f22':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 18:02:42 +0000 (18:02 +0000)]
am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4c9ebc4c149627e4ea0ee82f053628021ef8bfe8':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:02:17 +0000 (18:02 +0000)]
am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
cf2b65ce7a5a1d60755a00ae4da6cd6b1101af8c':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 18:02:14 +0000 (18:02 +0000)]
am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
c25dbb50c30816c97227b9a26cc46afec4e5318e':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 18:02:11 +0000 (18:02 +0000)]
am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
af6288b721110ffc4b4e68d55398b5ca31fc32e8':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 18:02:08 +0000 (18:02 +0000)]
am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
68ec033b7c9ea28155bbb007b01d5dbce2239392':
Fix a bug in submenu presenter priority handling
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.
Christopher Tate [Thu, 13 Mar 2014 17:19:17 +0000 (17:19 +0000)]
am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
87503f8561296fea489f8a3fe8384f61150976da':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 17:19:14 +0000 (17:19 +0000)]
am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
Import translations. DO NOT MERGE
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.
Alan Viverette [Thu, 13 Mar 2014 10:01:39 +0000 (10:01 +0000)]
am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
9ebe031cdc916646e95ffcd92dde67e1655be7ba':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 10:01:35 +0000 (10:01 +0000)]
am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 10:01:30 +0000 (10:01 +0000)]
am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
3c3377a2290764937548de5a49ca8ec28dc98153':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 10:01:15 +0000 (10:01 +0000)]
am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
75958c298477a3d1e556c4fe36e516b9e828c311':
Fix a bug in submenu presenter priority handling
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.
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.
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
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
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
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
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.
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
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
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: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
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
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
Scott Main [Tue, 11 Mar 2014 19:18:48 +0000 (19:18 +0000)]
am
2ada4e31: am
7b0c111b: am
69e49a81: Merge "fix typos" into klp-docs
* commit '
2ada4e310d728756fc9bf69086987bfe215dc487':
fix typos
Jose Lima [Tue, 11 Mar 2014 18:08:53 +0000 (18:08 +0000)]
Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
Robert Greenwalt [Tue, 11 Mar 2014 17:44:20 +0000 (17:44 +0000)]
am
e8af5e10: am
6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '
e8af5e10e04697acb26b47e5d60b99e5c61a020c':
DO NOT MERGE Debounce wifi country code Info
Zhihai Xu [Tue, 11 Mar 2014 17:43:56 +0000 (17:43 +0000)]
am
c48c9626: am
82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '
c48c9626bd2eb91aab33a034baf139aa2b92671d':
DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
Vinit Deshapnde [Tue, 11 Mar 2014 17:43:50 +0000 (17:43 +0000)]
am
5f683ca8: am
5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '
5f683ca80611c3e98c91f631ee05dccf3e7e0227':
DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
John Spurlock [Tue, 11 Mar 2014 17:43:46 +0000 (17:43 +0000)]
am
0a3cb2ce: am
b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs
* commit '
0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
Fix doc typos in Vibrator.java
Scott Main [Tue, 11 Mar 2014 17:43:42 +0000 (17:43 +0000)]
am
790c5a4c: am
29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs
* commit '
790c5a4c06e0ceee8fbdbed575e93ef257124569':
fix some typos for GoogleApiClient doc
Scott Main [Tue, 11 Mar 2014 17:43:38 +0000 (17:43 +0000)]
am
7b0c111b: am
69e49a81: Merge "fix typos" into klp-docs
* commit '
7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
fix typos
Jose Lima [Tue, 11 Mar 2014 17:41:39 +0000 (10:41 -0700)]
Added LEANBACK_LAUNCHER Intent category
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
Christopher Tate [Tue, 11 Mar 2014 17:37:06 +0000 (17:37 +0000)]
am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
e9821bf2380bfa325e6398a6390a4083007d3006':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Tue, 11 Mar 2014 17:37:03 +0000 (17:37 +0000)]
am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7138395b26fcad9664ad05b9c98109f60db8a557':
Import translations. DO NOT MERGE
Christopher Tate [Tue, 11 Mar 2014 17:34:15 +0000 (17:34 +0000)]
Merge "DO NOT MERGE - Don't hang installs if the transport disappears" into klp-dev
Baligh Uddin [Tue, 11 Mar 2014 17:33:28 +0000 (17:33 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Narayan Kamath [Tue, 11 Mar 2014 15:21:04 +0000 (15:21 +0000)]
am
a8706527: am
b071a07d: am
a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '
a870652789cc2b06b921fe66aa1bf48d4fc3e97c':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Tue, 11 Mar 2014 15:17:45 +0000 (15:17 +0000)]
am
b071a07d: am
a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '
b071a07da89a8736fa4fd757f9a6c6e990d0e858':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Tue, 11 Mar 2014 15:14:26 +0000 (08:14 -0700)]
am
a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '
a79af3647f7f93825b84cc25187527b5aac60a69':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Tue, 11 Mar 2014 15:09:44 +0000 (15:09 +0000)]
Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
Narayan Kamath [Tue, 11 Mar 2014 15:02:10 +0000 (15:02 +0000)]
Remove java.io.tmpdir assignment in AndroidRuntime (again).
This was brought back by a bad merge conflict resolution
in change
0efbd9a463c848118c7685f4bfc8765a82caa761.
Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
Narayan Kamath [Tue, 11 Mar 2014 12:08:58 +0000 (12:08 +0000)]
am
b485d8e1: am
194e77aa: am
0f3fd6c6: Merge "Remove stray logging statement."
* commit '
b485d8e1e405296307197ae07c6ed214be3b4f58':
Remove stray logging statement.
Narayan Kamath [Tue, 11 Mar 2014 12:06:00 +0000 (12:06 +0000)]
am
194e77aa: am
0f3fd6c6: Merge "Remove stray logging statement."
* commit '
194e77aafe32cacc00f69b25bec6eeea67eb0205':
Remove stray logging statement.
Narayan Kamath [Tue, 11 Mar 2014 12:03:36 +0000 (05:03 -0700)]
am
0f3fd6c6: Merge "Remove stray logging statement."
* commit '
0f3fd6c66e8376e62ed61dd2b92ea4807571b3de':
Remove stray logging statement.
Narayan Kamath [Tue, 11 Mar 2014 12:00:54 +0000 (12:00 +0000)]
Merge "Remove stray logging statement."