80 Commits

Author SHA1 Message Date
Jim Kaye
b57679e2e7 Support keyboard entry of non-ASCII characters
Add characters to the keyboard mapping to allow them
to be entered into the AVD from the developer's PC
keyboard.

This mapping supports the non-ASCII keys that appear
on the "US International" keyboard. Most of the Latin-1
characters (but not all) appear on this keyboard.

This change does not remove support for any keys.

b.android.com/200042

Change-Id: I65d54eb36183382b171c388b26848941eb0ff8d9
(cherry picked from commit dac57966a9ddc2e3dbd233c8b1e7b83f60e11373)
2016-03-02 18:56:10 +00:00
Jim Kaye
5b77f70d8b Extend the 'qwerty' key layout
Add the App Switch (Recents) key.
Add media control keys.

These are needed to support Emulator UI
buttons for these functions.

Change-Id: I5d5d25a77625bfd831cf7b31c126fd342efc6c5b
2015-11-20 09:59:25 -08:00
Michael Wright
f6d7c67962 Add kernel keycode mapping for new cut / copy / paste keys
Bug: 25120948
Change-Id: I33a93fa6c067d15a9739ca33703e0e48e8cf6eff
2015-10-22 15:54:02 +01:00
Michael Wright
04fc7b7510 Fix broken KL file.
Buttons should be L1 and R1 instead of L and R.

Change-Id: I1e345f7e28ad6b47248656a7f79d5507c62aa007
2015-10-13 14:13:33 +01:00
Michael Wright
c51179e9ab Update NES controller key layout
Turns out they produce an SNES controller with the same VID/PID as
their NES controller. Just remap both at once.

Change-Id: Iba94fdd69fd846f99ca1b3205de9069989635c73
2015-10-13 12:34:05 +00:00
Puneet Kumar
f975a26bfe am d621ee11: am edc3585f: am 0a1f0e56: Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev
* commit 'd621ee11fa76d7dd803a802bf000baa591c84fbe':
  Add ESC mapping for Pixel C keyboard
2015-10-08 09:20:01 +00:00
Puneet Kumar
2a370c4932 am 0068ea5b: am 8810285f: am 06d1254c: Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev
* commit '0068ea5bf7c9988174b0991eb87bb09f5838c39c':
  Add layout and keymap for Pixel C Bluetooth keyboard
2015-10-08 09:19:55 +00:00
Dmitry Torokhov
a43a96be9e Add ESC mapping for Pixel C keyboard
Now that we have "replace" key event support in the framework we can map
ESC as AltR+1.

Bug: 24504154

Change-Id: Ief8a50098fc5484171011f268ffc22a309cbba62
2015-09-29 13:31:18 -07:00
Dmitry Torokhov
4608f10849 Add layout and keymap for Pixel C Bluetooth keyboard
This adds special layout and character map for Pixel C keyboard (Dragon
base) that lacks several keys, such as ESC, bracket keys, tilda and
backslash, which are mapped various Alt-R combinations.

Currently we map:

 [Shift]+AltR+2 -> ~ and `
 [Shift]+AltR+O -> { and [
 [Shift]+AltR+P -> } and ]
 [Shift]+AltR+= -> | and \

ESC mapping requires additional changes.

Bug: 24504154

Change-Id: I24fc68efe7e2ddebee26a273838443b441491857
2015-09-29 13:30:59 -07:00
Ying Wang
9f8ec39d11 am e8d735c7: Merge "Remove all_modules\'s dependency on keymaps validation."
* commit 'e8d735c70a594abdfbf9ff16ef2ccfc9b87a3635':
  Remove all_modules's dependency on keymaps validation.
2015-05-06 22:56:04 +00:00
Ying Wang
366d6d0d12 Remove all_modules's dependency on keymaps validation.
With this we won't try to run validatekeymaps.exe when you run
"USE_MINGW=1 mma".
Also it seems it's too much to run the validation for every mma/mmma.
Validation in just platform build (droidcore) should be enough.

Change-Id: I22431009d4c2dd765bbd14b24eb5c8729b53d6c1
2015-05-05 16:12:41 -07:00
Michael Wright
e72a657561 Mark AVRCP devices as internal.
This prevents devices from waking up when an AVRCP key is injected.

Bug: 19685657
Change-Id: I97137531da07b61211b792b407c4c9a09b231839
2015-03-11 17:23:09 -07:00
Michael Wright
c859b85cb5 Merge "Added Razer USA, Ltd serval" 2014-12-01 23:47:37 +00:00
Mathieu Meisser
ad66d7d2c1 Add keylayout for Logitech RedHawk Gamepad
Change-Id: Iad03de3384052b360d6b9d887ca9540de68cd21e
2014-11-27 00:46:01 +01:00
Stuart Wells
7e1435ec3c Added Razer USA, Ltd serval
Change-Id: I76b7c36068c3d10ab4acb3123550ef115db0d3d2
2014-11-17 10:28:47 -08:00
Michael Wright
5ba44281c7 Add keylayout for Asus Gamepad
Bug: 17627642
Change-Id: I9dd76bbc3ea0493d5a54479ef4dc94c520e35433
2014-09-23 16:04:35 -07:00
Michael Wright
b1e3b70aeb Remove Rhodi keylayout
Looks like Broadcom re-used the Rhodi PID since we never shipped.
Remove the keylayout so we don't accidentally use it for other
devices.

Bug: 17504946
Change-Id: Ia11ad40f8ba7d49f82e7f68d881cf7c9bfafcb37
2014-09-16 16:48:58 -07:00
Michael Wright
1ce304bb02 Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST
This is to simplify Project Watson requirements and enable USB Audio
to easily implement similar functionality to the Watson headsets.

Change-Id: Idd0a0cd6c6ba4a977090fb338d9241046f0380e6
2014-09-05 17:45:26 -07:00
Michael Wright
8111462d01 Add layout for OnLive controller with USB adapter
Change-Id: Ie21ba6550f62eb4797e0e51104b99c2a4a7c44d7
2014-05-30 12:27:00 -07:00
Michael Wright
725265a9c2 Add KL file for Logitech F310
Change-Id: I03f4fd74fb54571e2045b9289228150a348c994a
2014-05-21 15:39:24 -07:00
Michael Wright
11ad0e8bac am e8628797: am 09446329: am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."
* commit 'e8628797833dfab1319d7a17f9ff465de760c633':
  Map KEY_APPSELECT to APP_SWITCH.
2014-05-02 22:15:06 +00:00
Michael Wright
e862879783 am 09446329: am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."
* commit '09446329b1afbbc8b56885e61ed66841b59532b2':
  Map KEY_APPSELECT to APP_SWITCH.
2014-05-02 19:20:01 +00:00
Michael Wright
09446329b1 am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."
* commit '52025796cd264fd8ba3851c8e42fd5508366456a':
  Map KEY_APPSELECT to APP_SWITCH.
2014-05-02 19:16:16 +00:00
Olivier Gay
8840f1f13a Map KEY_APPSELECT to APP_SWITCH.
Change-Id: Iec801f2edfec9923aac088cb66663f64d62b3df6
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
2014-05-01 11:11:27 +02:00
Michael Wright
4642063d87 Improve Gamepad fallbacks for text entry.
Change-Id: Ia8b05730a9b41b93006e678aba2d182748e56083
2014-04-29 16:06:14 -07:00
Michael Wright
337d9d2edc Move key attribute information into KeyEvent.
This consolidates all of the information that was in the native
KeyEvent and the KeyLayout files into the managed KeyEvent class.

It also moves the definition for all of the key names to the native
side, rather than having them in both places.

Change-Id: I172e3b554e7eb52c79ae2ec406ef4332e8b25ffa
2014-04-28 14:33:40 -07:00
Tim Kilbourn
edad218f5a Add Fire TV remote key layout.
Change-Id: Ida72c48701bf0366f488f1c99ab17e0e5c45de78
2014-04-18 14:24:12 -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
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
Zhihai Xu
7434fa31d8 DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
This reverts commit 371427b53c70d1a71012de404c29187fe303a22a.

bug:12099469
Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
2014-03-10 10:58:14 -07:00
Jeff Brown
2901e0442a am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '9e3de5f70d77f7152b25fec6c27b73d037c1376d':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-08 05:43:12 +00:00
Jeff Brown
6212a49a94 Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.

Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.

Bug: 12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
2014-03-07 14:02:55 -08:00
Michael Wright
a6434b5e80 am 78e208ac: am 6b661fdc: am dd9f7cb2: Add Odie KL file.
* commit '78e208accebd68fd1dc634a57323cafa1143d6ed':
  Add Odie KL file.
2014-03-06 02:57:18 +00:00
Michael Wright
dd9f7cb294 Add Odie KL file.
Change-Id: I74cc90a3c66e876db51da8f9fd8ced3bac373032
2014-03-05 17:47:54 -08:00
Michael Wright
bdffc3ad05 Revert Japanese special case fallback keys.
Reverts commits 4567e40eb04589d211af82f2dcb16cb3955c605e and
a977707d6e7006d11cfde045f187e777b31b9e04, which added special case fallbacks
for game controllers in the Japanese locale.

Bug: 12923922
Change-Id: I229126e589e11fb5de86772ef9c59d09723af941
2014-02-26 15:43:48 -08:00
Michael Wright
8a5dbac349 Remove Japanese button swap
Bug: 12923922
Change-Id: I4960d8189e751514a595823d7ed9b273e3ff8eb8
2014-02-14 13:20:58 -08:00
Zhihai Xu
c9eff80eca Merge "Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" 2014-01-10 17:44:22 +00:00
Michael Wright
fbefb93f26 Fix Rhodi KL file axes
Change-Id: Ifb779c7730ed4b69325bf57aa7629c663ee4cb5c
2014-01-08 15:40:14 -08:00
Zhihai Xu
5416022506 Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
This reverts commit 371427b53c70d1a71012de404c29187fe303a22a.

Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
2014-01-07 11:37:24 -08:00
Michael Wright
88d7a06508 Add Rhodi kl file
Change-Id: I950fd2df88b6100dce29e97fd1d9b292ed51fffe
2013-12-18 18:20:43 -08:00
Matthew Xie
ff0b79fc53 am 86271499: am f2194693: am 371427b5: Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."
* commit '86271499bbac0537630297a670ed67b869cd54d5':
  Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."
2013-11-04 21:59:19 -08:00
Matthew Xie
371427b53c Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."
This reverts commit 7a863b4bdae1d01d4ac972fe8ff8968bbfed6709.

bug 11325212
Change-Id: I8b50aec4ae39894a854583a74bda4db3445d3d67
2013-11-01 13:49:20 -07:00
Michael Wright
58f5a6134e Utilize new Android LED constants
Also, have EventHub manage game controllers' player LEDs

Change-Id: Ic0a1515979d72a30d182d51d89ca6753c5bd7bf8
2013-10-18 17:54:48 -07:00
Michael Wright
7b4f60deb2 Merge "Special case game controller fallback keys for Japan" into klp-dev 2013-09-07 02:04:20 +00:00
Michael Wright
37ad207edc Fix broken copy of kl/kcm/idc files to system image
Bug: 10633915
Change-Id: I244b85dc92d50bf8bdcfdf0fe32556eff8c5d279
2013-09-05 15:27:32 -07:00
Michael Wright
18e14c75e3 Fix keymap build dependencies and variable name collisions
Change-Id: I06e67ddc97429ae9c3d04143934c3f8233fcd22f
2013-09-03 12:27:18 -07:00
Michael Wright
4567e40eb0 Special case game controller fallback keys for Japan
Bug: 10306633
Change-Id: I647fc5286678ddd85599a00e68e2fd70c2c3db49
2013-08-26 12:27:37 -07:00
Michael Wright
2c126204a5 Remove incorrect keymapping
Turns out Snakebytes produce all 0s for their vendor / product IDs. This
somehow got the vendor / product ID of an international apple keyboard, which
will break them. Unfortunately, this also means we cannot map Snakebyte
controllers at all.

Relevant bug: https://code.google.com/p/android/issues/detail?id=58202

Change-Id: I59e134f8d1eb059fdf6823e65d6ce5387428029e
2013-07-29 13:54:46 -07:00
Michael Wright
d351180667 Include key maps based on file name
Rather than keeping a curated list where it's easy to miss things, just pick up
all of the possible key layouts, key character maps and input device configs in
framework/base/data/keyboards based on filename.

Change-Id: Iefa8eca491dcb6913e5b12bfda7096b6a5fedf18
(cherry picked from commit 9f5a6ee489f89c93491beef9bf64475fd2bfb0dd)
2013-05-14 00:05:05 +00:00
Michael Wright
275d6915e5 Add DPad keys to Playpad
Change-Id: If274aa7e9d5e4988cf613ea9a16584c413ded8dd
2013-04-26 15:06:38 -07:00