Commit Graph

23050 Commits

Author SHA1 Message Date
Jeff Brown
6a817e22e4 Add keycodes and meta-key modifiers to support external keyboards.
Added new key maps for external keyboards.  These maps are intended to
be shared across devices by inheriting the "keyboards.mk" product
makefile as part of the device's product definition.

One of the trickier changes here was to unwind some code in
MetaKeyKeyListener that assumed that only the low 8 bits of the meta key
state were actually used.  The new code abandons bitshifts in favor
of simple conditionals that are probably easier to read anyways.
The special meta key state constants used by MetaKeyKeyListener
are now (@hide) defined in KeyEvent now so as to make it clearer that they
share the same code space even if those codes are not valid for KeyEvents.

The EventHub now takes care of detecting the appropriate key layout
map and key character map when the device is added and sets system
properties accordingly.  This avoids having duplicate code in
KeyCharacterMap to probe for the appropriate key character map
although the current probing mechanism has been preserved for legacy
reasons just in case.

Added support for tracking caps lock, num lock and scroll lock and
turning their corresponding LEDs on and off as needed.

The key character map format will need to be updated to correctly support
PC style external keyboard semantics related to modifier keys.
That will come in a later change so caps lock doesn't actually do
anything right now except turn the shiny LEDs on and off...

Added a list of symbolic key names to KeyEvent and improved the toString()
output for debug diagnosis.  Having this list in a central place in the
framework also allows us to remove it from Monkey so there is one less
thing to maintain when we add new keycodes.

Bug: 2912307
Change-Id: If8c25e8d50a7c29bbf5d663c94284f5f86de5da4
2010-10-15 16:00:07 -07:00
Raphael Moll
cc13ed145c am 729503c2: am 848a2bc4: Merge "MinGW/Cygwin requires open() in O_BINARY mode." into gingerbread
Merge commit '729503c280e0d5b2621a8b7a6c93dd20fe1f5d0f'

* commit '729503c280e0d5b2621a8b7a6c93dd20fe1f5d0f':
  MinGW/Cygwin requires open() in O_BINARY mode.
2010-10-15 14:28:15 -07:00
Mathias Agopian
c9ce8cbe3b am 3d4a9774: am b0e020ab: Merge "may fix 3097381 and 3097482. don\'t abort on/off if the animation fails" into gingerbread
Merge commit '3d4a9774ced0c704da455c5bd9989127e90ba133'

* commit '3d4a9774ced0c704da455c5bd9989127e90ba133':
  may fix 3097381 and 3097482. don't abort on/off if the animation fails
2010-10-15 14:28:07 -07:00
Jaikumar Ganesh
6f2f8e1408 am 096a1e6c: am 8b525c07: Merge "Check for state before disconnecting." into gingerbread
Merge commit '096a1e6c83d3638788468dfb21a3b4662745d617'

* commit '096a1e6c83d3638788468dfb21a3b4662745d617':
  Check for state before disconnecting.
2010-10-15 14:27:55 -07:00
Joe Malin
52ce6d4f4b am 439444d9: am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
Merge commit '439444d9043c46669d2fe8694ed3db8f09d92282'

* commit '439444d9043c46669d2fe8694ed3db8f09d92282':
  DOC CHANGE: Fix bug in Testing doc
2010-10-15 14:26:57 -07:00
John Wang
a3d4c5a0cb Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-10-15 14:26:51 -07:00
Jeff Brown
28699cce02 am 567db077: am 2d441e14: Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread
Merge commit '567db07702f851f2e7fb1fb0021ce2871469183e'

* commit '567db07702f851f2e7fb1fb0021ce2871469183e':
  Make sure EventHub reports added/removed devices immediately.
2010-10-15 14:26:18 -07:00
Gil Dobjanschi
bc97966b98 Merge "Save the color for gradient effects" 2010-10-15 14:26:11 -07:00
Roy West
e50bdee23f am d23cc4b8: am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread
Merge commit 'd23cc4b814c01675f6503c4dcab21655c56d0256'

* commit 'd23cc4b814c01675f6503c4dcab21655c56d0256':
  Change storage names to match 10-13 decision
2010-10-15 14:26:08 -07:00
Joe Onorato
85d94b820b am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
Merge commit '35d34c67b7e94639086f2392d674e59b82c26a42'

* commit '35d34c67b7e94639086f2392d674e59b82c26a42':
  Do not build pbkdf2gen on non-Linux hosts
2010-10-15 14:25:59 -07:00
Gilles Debunne
1a6098823f am 4fa7f4f4: am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread
Merge commit '4fa7f4f4963568258a6b4179176de8386cb5d3db'

* commit '4fa7f4f4963568258a6b4179176de8386cb5d3db':
  Really leave text selection mode when using the trackball.
2010-10-15 14:25:48 -07:00
Ben Komalo
ab5a7c3542 Merge "Fix Spinners that don't have a hard pixel width set. getDimensionPixelSize -> getLayoutDimension" 2010-10-15 14:10:57 -07:00
Hung-ying Tyan
617990a756 am 4f5eb955: am bd57eeaf: SipService: add wake lock for multiple components.
Merge commit '4f5eb9550ba2cc037c4aa81613574a38a956dd5c'

* commit '4f5eb9550ba2cc037c4aa81613574a38a956dd5c':
  SipService: add wake lock for multiple components.
2010-10-15 14:01:39 -07:00
Hung-ying Tyan
6d2c059d18 am f3a935f6: am 3bb10442: Merge "Make SipService listen to WIFI state change events." into gingerbread
Merge commit 'f3a935f6aa421110c7b6f36f922223c195f751bc'

* commit 'f3a935f6aa421110c7b6f36f922223c195f751bc':
  Make SipService listen to WIFI state change events.
2010-10-15 14:01:10 -07:00
Kenny Root
d72b033033 am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84'

* commit '8fda1636e3e35f060b9046294efd3c062a1fdb84':
  OBB: use PBKDF2 for key generation.
2010-10-15 14:00:58 -07:00
Romain Guy
4a8ef92495 Merge "Fix clipping issue in StackView." 2010-10-15 14:00:17 -07:00
David Brown
4913b4244a am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread
Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a'

* commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
2010-10-15 13:40:16 -07:00
Justin Ho
ac2c85c075 am d9fdcfda: (-s ours) am c9110970: Merge "Updated media transport controls" into gingerbread
Merge commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559'

* commit 'd9fdcfdaad2f8177f8fa2bed2d6bd978a28d7559':
  Updated media transport controls
2010-10-15 13:39:31 -07:00
Justin Ho
e8b03c7f26 am 31e5901e: (-s ours) am b6634127: Merge "Updating popup center asset (v5)" into gingerbread
Merge commit '31e5901e4c1b753787bfc3c2aef3463c38f2d0eb'

* commit '31e5901e4c1b753787bfc3c2aef3463c38f2d0eb':
  Updating popup center asset (v5)
2010-10-15 13:32:21 -07:00
Kenny Root
4cbb0cee0b resolved conflicts for merge of 8b1082bb to master
Change-Id: If9d898123894c53bf83ac28cc7c03cd849c8ef17
2010-10-15 13:10:01 -07:00
Jaikumar Ganesh
e1503e71d9 am a905d955: am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread
Merge commit 'a905d9551103c5be465429ffeb0352b78058457e'

* commit 'a905d9551103c5be465429ffeb0352b78058457e':
  Remove STOPSHIP and reduce log spam.
2010-10-15 12:44:39 -07:00
Ben Komalo
a6dc764064 Merge "Apply values set in "dropDownWidth" attribute of Spinner styles." 2010-10-15 11:55:52 -07:00
Kenny Root
46e7e837b0 Merge "resolved conflicts for merge of c6bf3eaa to master" 2010-10-15 11:33:47 -07:00
Jason Sams
450ead5beb Merge "Fix deadlock on RS teardown." 2010-10-15 11:28:56 -07:00
Kenny Root
813f0c0442 resolved conflicts for merge of c6bf3eaa to master
Change-Id: I6421faf52c160a81b03c63b91f1aedfe0f151cac
2010-10-15 11:20:42 -07:00
Jaikumar Ganesh
1bd44e1c4f resolved conflicts for merge of bbb90d13 to master
Change-Id: I85de73f6e11e7547a006d41ca49021bca19af14b
2010-10-15 10:02:57 -07:00
Mindy Pereira
3d929c1095 am baf56089: (-s ours) am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread
Merge commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac'

* commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac':
  Never show overscroll if the page scrolls at all.
2010-10-15 09:29:40 -07:00
Mindy Pereira
574869fa57 am 7d73b706: (-s ours) am 868322ce: Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread
Merge commit '7d73b7066867368ebb30dd67a1649ae9db04b93e'

* commit '7d73b7066867368ebb30dd67a1649ae9db04b93e':
  Reduce the time it takes to decay the glow after a pull.
2010-10-15 09:10:52 -07:00
Mathias Agopian
e33a35f025 am 5bfa3a34: am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread
Merge commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f'

* commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f':
  implement part of [3094280] New animation for screen on and screen off
2010-10-15 08:33:43 -07:00
Andreas Huber
2222fb317a am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'

* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
2010-10-15 08:33:23 -07:00
Jean-Baptiste Queru
cc0b19dad5 am 0982d8d0: Merge "ignore - a similar change already exists" into gingerbread-plus-aosp
Merge commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027'

* commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027':
  Fix sometimes mExpandedView will appear while screen transforming.
2010-10-15 08:33:12 -07:00
Dan Morrill
fa834761cf am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread
Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'

* commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
2010-10-15 08:33:00 -07:00
Kenny Root
9197b6f1dc am 89b73a75: am 361a6ad1: Merge "Handle native library deletion in scanPackage" into gingerbread
Merge commit '89b73a75467d85c58467c5b8c080c77d25860fe0'

* commit '89b73a75467d85c58467c5b8c080c77d25860fe0':
  Handle native library deletion in scanPackage
2010-10-15 08:32:43 -07:00
Kenny Root
ed35350bab am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread
Merge commit '2f98a585cda066689b1b525322c51fcacbc3770b'

* commit '2f98a585cda066689b1b525322c51fcacbc3770b':
  OBB: Change documentation to reflect reality
2010-10-15 08:32:30 -07:00
Andreas Huber
1de68317db am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b'

* commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b':
  Attempt to derive the avg. bitrate of the entire stream from metadata.
2010-10-15 08:32:06 -07:00
Andreas Huber
88cb3809df am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread
Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160'

* commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160':
  Some webcams output rtp streams but never send any rtcp data in violation of
2010-10-15 00:08:35 -07:00
Kenny Root
37abeed739 am b4f26a9d: am e6ae5c39: Merge "Add shutdown assurance" into gingerbread
Merge commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd'

* commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd':
  Add shutdown assurance
2010-10-15 00:08:22 -07:00
Wink Saville
261ae1c198 am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread
Merge commit '94980e0f76295de53bd168608d11dba3c39cca9d'

* commit '94980e0f76295de53bd168608d11dba3c39cca9d':
  Fix NPE caused by Change I4df27119.
2010-10-15 00:07:40 -07:00
Scott Main
6892dcd903 am 5cfa877e: am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
Merge commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e'

* commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e':
  docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-15 00:07:26 -07:00
Nick Pelly
0fd0503468 am 67fc4af9: am 527d8bbd: Merge "Add missing native methods to fix boot." into gingerbread
Merge commit '67fc4af9765d15c4e011c8127f9c06dfd0368bbe'

* commit '67fc4af9765d15c4e011c8127f9c06dfd0368bbe':
  Add missing native methods to fix boot.
2010-10-15 00:05:29 -07:00
Kenny Root
36c12ad6e5 resolved conflicts for merge of a127c07c to master
Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
2010-10-14 23:58:41 -07:00
Andreas Huber
dab5c48231 am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread
Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'

* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
  HTTP Live content that are tagged as complete are now seekable.
2010-10-14 23:22:21 -07:00
Leon Scroggins
bea75801c4 am c7ee44cb: am dfc07279: Line up WebTextView text with the page.
Merge commit 'c7ee44cbe155c2272687a0e82133f3e729eac137'

* commit 'c7ee44cbe155c2272687a0e82133f3e729eac137':
  Line up WebTextView text with the page.
2010-10-14 23:03:23 -07:00
Mike Lockwood
64dff98e91 am 1442818a: am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
Merge commit '1442818a10988cc011f55104e997474b5d3d2468'

* commit '1442818a10988cc011f55104e997474b5d3d2468':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
2010-10-14 22:37:14 -07:00
Justin Ho
589bc941fd am 27023cc5: (-s ours) am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread
Merge commit '27023cc5fefc4e56f672ee264289fa319d97585b'

* commit '27023cc5fefc4e56f672ee264289fa319d97585b':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
2010-10-14 22:13:37 -07:00
Justin Ho
292902e64a am c42d196f: (-s ours) am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background
Merge commit 'c42d196f969e1d7f588e5e397176557c4c97575f'

* commit 'c42d196f969e1d7f588e5e397176557c4c97575f':
  Updated lockscreen asset (Hiroshi), new menu background
2010-10-14 21:48:20 -07:00
Hung-ying Tyan
bd9276b8e0 am 8a362186: am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
Merge commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c'

* commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c':
  SipService: mScreenOn is flipped to wrong value.
2010-10-14 21:19:54 -07:00
Nick Pelly
63beeca752 am 9fae3ecc: am ab39f1ef: Merge "Fix build." into gingerbread
Merge commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6'

* commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6':
  Fix build.
2010-10-14 21:19:36 -07:00
Dianne Hackborn
c2cbc954bc am 4ce930da: am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread
Merge commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea'

* commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash
2010-10-14 21:19:20 -07:00
Jaikumar Ganesh
e38bc55d45 am 373a6961: am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread
Merge commit '373a69614e534ae04dddd79c92933b6d8969fad7'

* commit '373a69614e534ae04dddd79c92933b6d8969fad7':
  Bluez doesn't handle disconnect while connecting well.
2010-10-14 21:19:04 -07:00