drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,365 Commits 1 Branch 0 Tags
Commit Graph

120365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
457c955476 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.
 2014-03-13 09:28:22 +00:00
Jason Sams
abe8dfb0e3 am 0641a5d4: am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '0641a5d4b1a3b0675c36f44adb05d0a5e20c3d56':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 09:28:19 +00:00
Jason Sams
2ffcffd046 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.
 2014-03-13 09:12:14 +00:00
Jason Sams
0641a5d4b1 am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '7f8a41079c342ff1f4f0ba3bf8e4f4e203da2649':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 09:12:09 +00:00
Jason Sams
280db65032 am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit 'e14d5e901172559a5e18077bde3ccafd03e8a6e2':
  Add hidden minor version ID for support lib workarounds.
 2014-03-13 01:35:42 +00:00
Jason Sams
7f8a41079c am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '0165db3802f0fafe0ad86b7699be7adaea6686da':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 01:35:38 +00:00
Michael Wright
444b0c6b72 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.
 2014-03-13 00:42:43 +00:00
Michael Wright
f80f60ba2b 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.
 2014-03-13 00:40:03 +00:00
Michael Wright
d23d916e0f Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev 2014-03-13 00:37:10 +00: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
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
Michael Wright
b0aa4822f5 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
 2014-03-12 12:58:53 -07: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
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
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
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
cc9894c825 Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-modular-dev 2014-03-12 03:42:20 +00:00
Jeff Brown
089886058a 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
 2014-03-11 19:30:22 -07:00
Justin Koh
c65caed6da 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.
 2014-03-12 00:49:44 +00:00
Justin Koh
c48701a134 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.
 2014-03-12 00:47:20 +00:00
Justin Koh
641d8aff87 Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev 2014-03-12 00:44:22 +00:00
Deepanshu Gupta
c32a98b8cc am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp 
* commit 'f978f16e50374681b0ade2d14a5e39cedaea6c2f':
  Fix the delegate method signatures in LayoutLib
 2014-03-11 23:43:26 +00:00
Deepanshu Gupta
f978f16e50 resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp 
Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
 2014-03-11 16:39:13 -07:00
Justin Koh
df4ee5c8ac 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
 2014-03-11 16:27:25 -07:00
Michael Wright
81686bd93c am a54f852d: am ed28fc89: Utilize new Android LED constants. DO NOT MERGE 
* commit 'a54f852d3df7ac2e245ccffe8409b217330e5092':
  Utilize new Android LED constants. DO NOT MERGE
 2014-03-11 23:26:39 +00:00
Jose Lima
c770e064ef am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit 'dd0db799ee25833a8989a823299f039ac31fef58':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-11 23:20:32 +00:00
Robert Greenwalt
31734c35bf 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
 2014-03-11 23:20:28 +00:00
Zhihai Xu
42703d1199 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.""
 2014-03-11 23:20:25 +00:00
Vinit Deshapnde
58795020ef 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
 2014-03-11 23:20:22 +00:00
John Spurlock
2fcac8ba6f 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
 2014-03-11 23:20:19 +00:00
Scott Main
41b600304e 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
 2014-03-11 23:20:16 +00:00
Scott Main
6fc25fb727 am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit 'a17a7000f2e1c5d38694c6329a8efdcad48fe1d5':
  fix typos
 2014-03-11 23:20:13 +00:00
Michael Wright
a54f852d3d am ed28fc89: Utilize new Android LED constants. DO NOT MERGE 
* commit 'ed28fc89e3085a88c6bd8b4269988150f3eceb56':
  Utilize new Android LED constants. DO NOT MERGE
 2014-03-11 23:16:25 +00:00
Deepanshu Gupta
c76345a396 am 792f38dd: Merge "Fix the delegate method signatures in LayoutLib" 
* commit '792f38ddd9e8d25b2c8bf0d67363dbfa56550636':
  Fix the delegate method signatures in LayoutLib
 2014-03-11 16:16:18 -07:00
Michael Wright
ed28fc89e3 Utilize new Android LED constants. DO NOT MERGE 
Also, have EventHub manage game controllers' player LEDs

Change-Id: Ic7dba19ad236a3c7d1aff5d3f938bd239b98d51d
 2014-03-11 14:52:18 -07:00
Deepanshu Gupta
792f38ddd9 Merge "Fix the delegate method signatures in LayoutLib" 2014-03-11 21:22:40 +00:00
Jose Lima
dd0db799ee am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit '5f0c0498a1382ef955cccca95920ec878fe2a64c':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-11 19:19:11 +00:00
Robert Greenwalt
ee142967f6 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
 2014-03-11 19:19:07 +00:00
Zhihai Xu
cb714ae68e 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.""
 2014-03-11 19:19:05 +00:00
Vinit Deshapnde
dbba6f0769 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
 2014-03-11 19:19:02 +00:00
John Spurlock
b41c951fb1 am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit 'cb5f813bb642e72777643dcd2bcbd92cc2039388':
  Fix doc typos in Vibrator.java
 2014-03-11 19:18:59 +00:00