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

120154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Scott Main
60d18ceaf1 am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '212075889eab9aab2c48881803888a1b827d77ba':
  fix some typos for GoogleApiClient doc
 2014-03-11 19:18:55 +00:00
Scott Main
a17a7000f2 am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '2ada4e310d728756fc9bf69086987bfe215dc487':
  fix typos
 2014-03-11 19:18:48 +00:00
Jose Lima
5f0c0498a1 Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 2014-03-11 18:08:53 +00:00
Robert Greenwalt
e5098b502c 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
 2014-03-11 17:44:20 +00:00
Zhihai Xu
74f36d3189 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.""
 2014-03-11 17:43:56 +00:00
Vinit Deshapnde
2e76f5d8a2 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
 2014-03-11 17:43:50 +00:00
John Spurlock
cb5f813bb6 am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
  Fix doc typos in Vibrator.java
 2014-03-11 17:43:46 +00:00
Scott Main
212075889e am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '790c5a4c06e0ceee8fbdbed575e93ef257124569':
  fix some typos for GoogleApiClient doc
 2014-03-11 17:43:42 +00:00
Scott Main
2ada4e310d am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
  fix typos
 2014-03-11 17:43:38 +00:00
Jose Lima
38b75b6126 Added LEANBACK_LAUNCHER Intent category 
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
 2014-03-11 10:43:31 -07:00
Narayan Kamath
a870652789 am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 
* commit 'b071a07da89a8736fa4fd757f9a6c6e990d0e858':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
 2014-03-11 15:17:45 +00:00
Narayan Kamath
b071a07da8 am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 
* commit 'a79af3647f7f93825b84cc25187527b5aac60a69':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
 2014-03-11 08:14:26 -07:00
Narayan Kamath
a79af3647f Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 2014-03-11 15:09:45 +00:00
Narayan Kamath
b3802a8e23 Remove java.io.tmpdir assignment in AndroidRuntime (again). 
This was brought back by a bad merge conflict resolution
in change 0efbd9a463c848118c7685f4bfc8765a82caa761.

Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
 2014-03-11 15:02:10 +00:00
Narayan Kamath
b485d8e1e4 am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '194e77aafe32cacc00f69b25bec6eeea67eb0205':
  Remove stray logging statement.
 2014-03-11 12:06:00 +00:00
Narayan Kamath
194e77aafe am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '0f3fd6c66e8376e62ed61dd2b92ea4807571b3de':
  Remove stray logging statement.
 2014-03-11 05:03:36 -07:00
Narayan Kamath
0f3fd6c66e Merge "Remove stray logging statement." 2014-03-11 12:00:55 +00:00
Narayan Kamath
c3955e7e5a Remove stray logging statement. 
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
 2014-03-11 11:08:41 +00:00
Jeff Brown
f54d62dc80 am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit 'fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
  Round off when calculate next step in Seekbar
 2014-03-11 00:15:38 +00:00
Jeff Brown
fc7315c6c1 am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit '6d71e165ba961251f0705b75aafed74eba1bc570':
  Round off when calculate next step in Seekbar
 2014-03-10 17:11:57 -07:00
Jeff Brown
1400652309 am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit '33282d66155e8d68acea512989ec61cb15fae1ce':
  Fixed typo errors in documentation
 2014-03-11 00:11:14 +00:00
Jeff Brown
daa1c96954 am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'aaf23a9a653457cccf54293b2ff76196718c7a1a':
  Hang off call by power button while screen is on
 2014-03-11 00:11:10 +00:00
Jeff Brown
f2e837e579 am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit 'e7f7af964baa3c5d36abd163e33ad139310049d2':
  take account of RotationVector's new extra parameter
 2014-03-11 00:11:05 +00:00
Jeff Brown
33282d6615 am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit 'a41ddccdc67ace7c9363efebbf6e51710928ce12':
  Fixed typo errors in documentation
 2014-03-10 17:08:27 -07:00
Jeff Brown
aaf23a9a65 am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'c3f5d694324fbe2831405ce60bc43bd0d0183d07':
  Hang off call by power button while screen is on
 2014-03-10 17:08:24 -07:00