summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2013-01-27 09:18:14 +0000
committercodeworkx <codeworkx@cyanogenmod.org>2013-02-17 09:55:55 +0000
commitcf2c95eef4be5e312e2310f38424fba4575a9462 (patch)
treeaa9cbe4dfa145acddb745053ea2abde08f3e2aab
parent79230b71742264fbc161cd144e4a584e298dcd1f (diff)
downloaddevice_samsung_i9100-cf2c95eef4be5e312e2310f38424fba4575a9462.zip
device_samsung_i9100-cf2c95eef4be5e312e2310f38424fba4575a9462.tar.gz
device_samsung_i9100-cf2c95eef4be5e312e2310f38424fba4575a9462.tar.bz2
i9100: keyfiles and extract cleanup
Change-Id: Ic1c9a6ff3364f7d37577144ba805bbbae7350ef6
-rw-r--r--i9100.mk21
-rw-r--r--proprietary-files.txt17
-rw-r--r--usr/idc/qwerty.idc28
-rw-r--r--usr/idc/qwerty2.idc28
-rw-r--r--usr/keychars/Generic.kcm672
-rw-r--r--usr/keychars/Virtual.kcm544
-rw-r--r--usr/keychars/qwerty.kcm508
-rw-r--r--usr/keychars/qwerty2.kcm505
-rw-r--r--usr/keylayout/AVRCP.kl23
-rw-r--r--usr/keylayout/Generic.kl421
-rw-r--r--usr/keylayout/Vendor_045e_Product_028e.kl46
-rw-r--r--usr/keylayout/Vendor_046d_Product_c216.kl37
-rw-r--r--usr/keylayout/Vendor_046d_Product_c294.kl53
-rw-r--r--usr/keylayout/Vendor_046d_Product_c299.kl62
-rw-r--r--usr/keylayout/Vendor_046d_Product_c532.kl133
-rw-r--r--usr/keylayout/Vendor_054c_Product_0268.kl76
-rw-r--r--usr/keylayout/Vendor_05ac_Product_0239.kl119
-rw-r--r--usr/keylayout/Vendor_22b8_Product_093d.kl105
-rw-r--r--usr/keylayout/gpio-keys.kl13
-rw-r--r--usr/keylayout/qwerty.kl112
-rw-r--r--usr/keylayout/sii9234_rcp.kl28
21 files changed, 32 insertions, 3519 deletions
diff --git a/i9100.mk b/i9100.mk
index edab9c3..fc1a3a6 100644
--- a/i9100.mk
+++ b/i9100.mk
@@ -40,37 +40,18 @@ PRODUCT_PACKAGES += \
# Keylayout
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/usr/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \
- $(LOCAL_PATH)/usr/keylayout/Generic.kl:system/usr/keylayout/Generic.kl \
$(LOCAL_PATH)/usr/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \
$(LOCAL_PATH)/usr/keylayout/max8997-muic.kl:system/usr/keylayout/max8997-muic.kl \
$(LOCAL_PATH)/usr/keylayout/melfas-touchkey.kl:system/usr/keylayout/melfas-touchkey.kl \
- $(LOCAL_PATH)/usr/keylayout/qwerty.kl:system/usr/keylayout/qwerty.kl \
$(LOCAL_PATH)/usr/keylayout/samsung-keypad.kl:system/usr/keylayout/samsung-keypad.kl \
$(LOCAL_PATH)/usr/keylayout/sec_key.kl:system/usr/keylayout/sec_key.kl \
$(LOCAL_PATH)/usr/keylayout/sec_touchkey.kl:system/usr/keylayout/sec_touchkey.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_05ac_Product_0239.kl:system/usr/keylayout/Vendor_05ac_Product_0239.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_22b8_Product_093d.kl:system/usr/keylayout/Vendor_22b8_Product_093d.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_045e_Product_028e.kl:system/usr/keylayout/Vendor_045e_Product_028e.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c216.kl:system/usr/keylayout/Vendor_046d_Product_c216.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c294.kl:system/usr/keylayout/Vendor_046d_Product_c294.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c299.kl:system/usr/keylayout/Vendor_046d_Product_c299.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_046d_Product_c532.kl:system/usr/keylayout/Vendor_046d_Product_c532.kl \
- $(LOCAL_PATH)/usr/keylayout/Vendor_054c_Product_0268.kl:system/usr/keylayout/Vendor_054c_Product_0268.kl
-
-# Keychars
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/usr/keychars/Generic.kcm:system/usr/keychars/Generic.kcm \
- $(LOCAL_PATH)/usr/keychars/qwerty.kcm:system/usr/keychars/qwerty.kcm \
- $(LOCAL_PATH)/usr/keychars/qwerty2.kcm:system/usr/keychars/qwerty2.kcm \
- $(LOCAL_PATH)/usr/keychars/Virtual.kcm:system/usr/keychars/Virtual.kcm
+ $(LOCAL_PATH)/usr/keylayout/sii9234_rcp.kl:system/usr/keylayout/sii9234_rcp.kl
# Idc
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/usr/idc/melfas_ts.idc:system/usr/idc/melfas_ts.idc \
$(LOCAL_PATH)/usr/idc/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc \
- $(LOCAL_PATH)/usr/idc/qwerty.idc:system/usr/idc/qwerty.idc \
- $(LOCAL_PATH)/usr/idc/qwerty2.idc:system/usr/idc/qwerty2.idc \
$(LOCAL_PATH)/usr/idc/sec_touchscreen.idc:system/usr/idc/sec_touchscreen.idc
$(call inherit-product-if-exists, vendor/samsung/i9100/i9100-vendor.mk)
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4a3d10b..6d73bee 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -3,21 +3,4 @@ system/lib/libril.so
system/lib/libsec-ril.so
system/lib/libsecril-client.so
system/lib/hw/gps.exynos4.so
-system/bin/bcm4330B1.hcd
-system/etc/wifi/bcm4330_apsta.bin
-system/etc/wifi/bcm4330_mfg.bin
-system/etc/wifi/bcm4330_p2p.bin
-system/etc/wifi/bcm4330_sta.bin
-system/etc/wifi/nvram_mfg.txt
-system/etc/wifi/nvram_mfg.txt_murata
-system/etc/wifi/nvram_net.txt
-system/etc/wifi/nvram_net.txt_AU
-system/etc/wifi/nvram_net.txt_IL
-system/etc/wifi/nvram_net.txt_SG
-system/etc/wifi/nvram_net.txt_TN
-system/etc/wifi/nvram_net.txt_murata
-system/etc/wifi/nvram_net.txt_murata_AU
-system/etc/wifi/nvram_net.txt_murata_IL
-system/etc/wifi/nvram_net.txt_murata_SG
-system/etc/wifi/nvram_net.txt_murata_TN
system/lib/libakm.so
diff --git a/usr/idc/qwerty.idc b/usr/idc/qwerty.idc
deleted file mode 100644
index 375d785..0000000
--- a/usr/idc/qwerty.idc
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Emulator keyboard configuration file #1.
-#
-
-touch.deviceType = touchScreen
-touch.orientationAware = 1
-
-keyboard.layout = qwerty
-keyboard.characterMap = qwerty
-keyboard.orientationAware = 1
-keyboard.builtIn = 1
-
-cursor.mode = navigation
-cursor.orientationAware = 1
diff --git a/usr/idc/qwerty2.idc b/usr/idc/qwerty2.idc
deleted file mode 100644
index 369205e..0000000
--- a/usr/idc/qwerty2.idc
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Emulator keyboard configuration file #2.
-#
-
-touch.deviceType = touchScreen
-touch.orientationAware = 1
-
-keyboard.layout = qwerty
-keyboard.characterMap = qwerty2
-keyboard.orientationAware = 1
-keyboard.builtIn = 1
-
-cursor.mode = navigation
-cursor.orientationAware = 1
diff --git a/usr/keychars/Generic.kcm b/usr/keychars/Generic.kcm
deleted file mode 100644
index b5f6897..0000000
--- a/usr/keychars/Generic.kcm
+++ /dev/null
@@ -1,672 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Generic key character map for full alphabetic US English PC style external keyboards.
-#
-# This file is intentionally very generic and is intended to support a broad rang of keyboards.
-# Do not edit the generic key character map to support a specific keyboard; instead, create
-# a new key character map file with the required keyboard configuration.
-#
-
-type FULL
-
-### Basic QWERTY keys ###
-
-key A {
- label: 'A'
- base: 'a'
- shift, capslock: 'A'
- ctrl, alt, meta: none
-}
-
-key B {
- label: 'B'
- base: 'b'
- shift, capslock: 'B'
- ctrl, alt, meta: none
-}
-
-key C {
- label: 'C'
- base: 'c'
- shift, capslock: 'C'
- alt: '\u00e7'
- shift+alt: '\u00c7'
- ctrl, meta: none
-}
-
-key D {
- label: 'D'
- base: 'd'
- shift, capslock: 'D'
- ctrl, alt, meta: none
-}
-
-key E {
- label: 'E'
- base: 'e'
- shift, capslock: 'E'
- alt: '\u0301'
- ctrl, meta: none
-}
-
-key F {
- label: 'F'
- base: 'f'
- shift, capslock: 'F'
- ctrl, alt, meta: none
-}
-
-key G {
- label: 'G'
- base: 'g'
- shift, capslock: 'G'
- ctrl, alt, meta: none
-}
-
-key H {
- label: 'H'
- base: 'h'
- shift, capslock: 'H'
- ctrl, alt, meta: none
-}
-
-key I {
- label: 'I'
- base: 'i'
- shift, capslock: 'I'
- alt: '\u0302'
- ctrl, meta: none
-}
-
-key J {
- label: 'J'
- base: 'j'
- shift, capslock: 'J'
- ctrl, alt, meta: none
-}
-
-key K {
- label: 'K'
- base: 'k'
- shift, capslock: 'K'
- ctrl, alt, meta: none
-}
-
-key L {
- label: 'L'
- base: 'l'
- shift, capslock: 'L'
- ctrl, alt, meta: none
-}
-
-key M {
- label: 'M'
- base: 'm'
- shift, capslock: 'M'
- ctrl, alt, meta: none
-}
-
-key N {
- label: 'N'
- base: 'n'
- shift, capslock: 'N'
- alt: '\u0303'
- ctrl, meta: none
-}
-
-key O {
- label: 'O'
- base: 'o'
- shift, capslock: 'O'
- ctrl, alt, meta: none
-}
-
-key P {
- label: 'P'
- base: 'p'
- shift, capslock: 'P'
- ctrl, alt, meta: none
-}
-
-key Q {
- label: 'Q'
- base: 'q'
- shift, capslock: 'Q'
- ctrl, alt, meta: none
-}
-
-key R {
- label: 'R'
- base: 'r'
- shift, capslock: 'R'
- ctrl, alt, meta: none
-}
-
-key S {
- label: 'S'
- base: 's'
- shift, capslock: 'S'
- alt: '\u00df'
- ctrl, meta: none
-}
-
-key T {
- label: 'T'
- base: 't'
- shift, capslock: 'T'
- ctrl, alt, meta: none
-}
-
-key U {
- label: 'U'
- base: 'u'
- shift, capslock: 'U'
- alt: '\u0308'
- ctrl, meta: none
-}
-
-key V {
- label: 'V'
- base: 'v'
- shift, capslock: 'V'
- ctrl, alt, meta: none
-}
-
-key W {
- label: 'W'
- base: 'w'
- shift, capslock: 'W'
- ctrl, alt, meta: none
-}
-
-key X {
- label: 'X'
- base: 'x'
- shift, capslock: 'X'
- ctrl, alt, meta: none
-}
-
-key Y {
- label: 'Y'
- base: 'y'
- shift, capslock: 'Y'
- ctrl, alt, meta: none
-}
-
-key Z {
- label: 'Z'
- base: 'z'
- shift, capslock: 'Z'
- ctrl, alt, meta: none
-}
-
-key 0 {
- label, number: '0'
- base: '0'
- shift: ')'
- ctrl, alt, meta: none
-}
-
-key 1 {
- label, number: '1'
- base: '1'
- shift: '!'
- ctrl, alt, meta: none
-}
-
-key 2 {
- label, number: '2'
- base: '2'
- shift: '@'
- ctrl, alt, meta: none
-}
-
-key 3 {
- label, number: '3'
- base: '3'
- shift: '#'
- ctrl, alt, meta: none
-}
-
-key 4 {
- label, number: '4'
- base: '4'
- shift: '$'
- ctrl, alt, meta: none
-}
-
-key 5 {
- label, number: '5'
- base: '5'
- shift: '%'
- ctrl, alt, meta: none
-}
-
-key 6 {
- label, number: '6'
- base: '6'
- shift: '^'
- ctrl, alt, meta: none
- alt+shift: '\u0302'
-}
-
-key 7 {
- label, number: '7'
- base: '7'
- shift: '&'
- ctrl, alt, meta: none
-}
-
-key 8 {
- label, number: '8'
- base: '8'
- shift: '*'
- ctrl, alt, meta: none
-}
-
-key 9 {
- label, number: '9'
- base: '9'
- shift: '('
- ctrl, alt, meta: none
-}
-
-key SPACE {
- label: ' '
- base: ' '
- ctrl: none
- alt, meta: fallback SEARCH
-}
-
-key ENTER {
- label: '\n'
- base: '\n'
- ctrl, alt, meta: none
-}
-
-key TAB {
- label: '\t'
- base: '\t'
- ctrl, alt, meta: none
-}
-
-key COMMA {
- label, number: ','
- base: ','
- shift: '<'
- ctrl, alt, meta: none
-}
-
-key PERIOD {
- label, number: '.'
- base: '.'
- shift: '>'
- ctrl, alt, meta: none
-}
-
-key SLASH {
- label, number: '/'
- base: '/'
- shift: '?'
- ctrl, alt, meta: none
-}
-
-key GRAVE {
- label, number: '`'
- base: '`'
- shift: '~'
- alt: '\u0300'
- alt+shift: '\u0303'
- ctrl, meta: none
-}
-
-key MINUS {
- label, number: '-'
- base: '-'
- shift: '_'
- ctrl, alt, meta: none
-}
-
-key EQUALS {
- label, number: '='
- base: '='
- shift: '+'
- ctrl, alt, meta: none
-}
-
-key LEFT_BRACKET {
- label, number: '['
- base: '['
- shift: '{'
- ctrl, alt, meta: none
-}
-
-key RIGHT_BRACKET {
- label, number: ']'
- base: ']'
- shift: '}'
- ctrl, alt, meta: none
-}
-
-key BACKSLASH {
- label, number: '\\'
- base: '\\'
- shift: '|'
- ctrl, alt, meta: none
-}
-
-key SEMICOLON {
- label, number: ';'
- base: ';'
- shift: ':'
- ctrl, alt, meta: none
-}
-
-key APOSTROPHE {
- label, number: '\''
- base: '\''
- shift: '"'
- ctrl, alt, meta: none
-}
-
-### Numeric keypad ###
-
-key NUMPAD_0 {
- label, number: '0'
- base: fallback INSERT
- numlock: '0'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_1 {
- label, number: '1'
- base: fallback MOVE_END
- numlock: '1'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_2 {
- label, number: '2'
- base: fallback DPAD_DOWN
- numlock: '2'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_3 {
- label, number: '3'
- base: fallback PAGE_DOWN
- numlock: '3'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_4 {
- label, number: '4'
- base: fallback DPAD_LEFT
- numlock: '4'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_5 {
- label, number: '5'
- base: fallback DPAD_CENTER
- numlock: '5'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_6 {
- label, number: '6'
- base: fallback DPAD_RIGHT
- numlock: '6'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_7 {
- label, number: '7'
- base: fallback MOVE_HOME
- numlock: '7'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_8 {
- label, number: '8'
- base: fallback DPAD_UP
- numlock: '8'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_9 {
- label, number: '9'
- base: fallback PAGE_UP
- numlock: '9'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_LEFT_PAREN {
- label, number: '('
- base: '('
- ctrl, alt, meta: none
-}
-
-key NUMPAD_RIGHT_PAREN {
- label, number: ')'
- base: ')'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_DIVIDE {
- label, number: '/'
- base: '/'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_MULTIPLY {
- label, number: '*'
- base: '*'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_SUBTRACT {
- label, number: '-'
- base: '-'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_ADD {
- label, number: '+'
- base: '+'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_DOT {
- label, number: '.'
- base: fallback FORWARD_DEL
- numlock: '.'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_COMMA {
- label, number: ','
- base: ','
- ctrl, alt, meta: none
-}
-
-key NUMPAD_EQUALS {
- label, number: '='
- base: '='
- ctrl, alt, meta: none
-}
-
-key NUMPAD_ENTER {
- label: '\n'
- base: '\n' fallback ENTER
- ctrl, alt, meta: none fallback ENTER
-}
-
-### Special keys on phones ###
-
-key AT {
- label, number: '@'
- base: '@'
-}
-
-key STAR {
- label, number: '*'
- base: '*'
-}
-
-key POUND {
- label, number: '#'
- base: '#'
-}
-
-key PLUS {
- label, number: '+'
- base: '+'
-}
-
-### Non-printing keys ###
-
-key ESCAPE {
- base: fallback BACK
- alt, meta: fallback HOME
- ctrl: fallback MENU
-}
-
-### Gamepad buttons ###
-
-key BUTTON_A {
- base: fallback BACK
-}
-
-key BUTTON_B {
- base: fallback BACK
-}
-
-key BUTTON_C {
- base: fallback BACK
-}
-
-key BUTTON_X {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_Y {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_Z {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_L1 {
- base: none
-}
-
-key BUTTON_R1 {
- base: none
-}
-
-key BUTTON_L2 {
- base: none
-}
-
-key BUTTON_R2 {
- base: none
-}
-
-key BUTTON_THUMBL {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_THUMBR {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_START {
- base: fallback HOME
-}
-
-key BUTTON_SELECT {
- base: fallback MENU
-}
-
-key BUTTON_MODE {
- base: fallback MENU
-}
-
-key BUTTON_1 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_2 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_3 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_4 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_5 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_6 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_7 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_8 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_9 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_10 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_11 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_12 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_13 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_14 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_15 {
- base: fallback DPAD_CENTER
-}
-
-key BUTTON_16 {
- base: fallback DPAD_CENTER
-}
diff --git a/usr/keychars/Virtual.kcm b/usr/keychars/Virtual.kcm
deleted file mode 100644
index 0ce4a68..0000000
--- a/usr/keychars/Virtual.kcm
+++ /dev/null
@@ -1,544 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Key character map for a built-in generic virtual keyboard primarily used
-# for instrumentation and testing purposes.
-#
-
-type FULL
-
-### Basic QWERTY keys ###
-
-key A {
- label: 'A'
- base: 'a'
- shift, capslock: 'A'
- ctrl, alt, meta: none
-}
-
-key B {
- label: 'B'
- base: 'b'
- shift, capslock: 'B'
- ctrl, alt, meta: none
-}
-
-key C {
- label: 'C'
- base: 'c'
- shift, capslock: 'C'
- alt: '\u00e7'
- shift+alt: '\u00c7'
- ctrl, meta: none
-}
-
-key D {
- label: 'D'
- base: 'd'
- shift, capslock: 'D'
- ctrl, alt, meta: none
-}
-
-key E {
- label: 'E'
- base: 'e'
- shift, capslock: 'E'
- alt: '\u0301'
- ctrl, meta: none
-}
-
-key F {
- label: 'F'
- base: 'f'
- shift, capslock: 'F'
- ctrl, alt, meta: none
-}
-
-key G {
- label: 'G'
- base: 'g'
- shift, capslock: 'G'
- ctrl, alt, meta: none
-}
-
-key H {
- label: 'H'
- base: 'h'
- shift, capslock: 'H'
- ctrl, alt, meta: none
-}
-
-key I {
- label: 'I'
- base: 'i'
- shift, capslock: 'I'
- alt: '\u0302'
- ctrl, meta: none
-}
-
-key J {
- label: 'J'
- base: 'j'
- shift, capslock: 'J'
- ctrl, alt, meta: none
-}
-
-key K {
- label: 'K'
- base: 'k'
- shift, capslock: 'K'
- ctrl, alt, meta: none
-}
-
-key L {
- label: 'L'
- base: 'l'
- shift, capslock: 'L'
- ctrl, alt, meta: none
-}
-
-key M {
- label: 'M'
- base: 'm'
- shift, capslock: 'M'
- ctrl, alt, meta: none
-}
-
-key N {
- label: 'N'
- base: 'n'
- shift, capslock: 'N'
- alt: '\u0303'
- ctrl, meta: none
-}
-
-key O {
- label: 'O'
- base: 'o'
- shift, capslock: 'O'
- ctrl, alt, meta: none
-}
-
-key P {
- label: 'P'
- base: 'p'
- shift, capslock: 'P'
- ctrl, alt, meta: none
-}
-
-key Q {
- label: 'Q'
- base: 'q'
- shift, capslock: 'Q'
- ctrl, alt, meta: none
-}
-
-key R {
- label: 'R'
- base: 'r'
- shift, capslock: 'R'
- ctrl, alt, meta: none
-}
-
-key S {
- label: 'S'
- base: 's'
- shift, capslock: 'S'
- alt: '\u00df'
- ctrl, meta: none
-}
-
-key T {
- label: 'T'
- base: 't'
- shift, capslock: 'T'
- ctrl, alt, meta: none
-}
-
-key U {
- label: 'U'
- base: 'u'
- shift, capslock: 'U'
- alt: '\u0308'
- ctrl, meta: none
-}
-
-key V {
- label: 'V'
- base: 'v'
- shift, capslock: 'V'
- ctrl, alt, meta: none
-}
-
-key W {
- label: 'W'
- base: 'w'
- shift, capslock: 'W'
- ctrl, alt, meta: none
-}
-
-key X {
- label: 'X'
- base: 'x'
- shift, capslock: 'X'
- ctrl, alt, meta: none
-}
-
-key Y {
- label: 'Y'
- base: 'y'
- shift, capslock: 'Y'
- ctrl, alt, meta: none
-}
-
-key Z {
- label: 'Z'
- base: 'z'
- shift, capslock: 'Z'
- ctrl, alt, meta: none
-}
-
-key 0 {
- label, number: '0'
- base: '0'
- shift: ')'
- ctrl, alt, meta: none
-}
-
-key 1 {
- label, number: '1'
- base: '1'
- shift: '!'
- ctrl, alt, meta: none
-}
-
-key 2 {
- label, number: '2'
- base: '2'
- shift: '@'
- ctrl, alt, meta: none
-}
-
-key 3 {
- label, number: '3'
- base: '3'
- shift: '#'
- ctrl, alt, meta: none
-}
-
-key 4 {
- label, number: '4'
- base: '4'
- shift: '$'
- ctrl, alt, meta: none
-}
-
-key 5 {
- label, number: '5'
- base: '5'
- shift: '%'
- ctrl, alt, meta: none
-}
-
-key 6 {
- label, number: '6'
- base: '6'
- shift: '^'
- ctrl, alt, meta: none
- alt+shift: '\u0302'
-}
-
-key 7 {
- label, number: '7'
- base: '7'
- shift: '&'
- ctrl, alt, meta: none
-}
-
-key 8 {
- label, number: '8'
- base: '8'
- shift: '*'
- ctrl, alt, meta: none
-}
-
-key 9 {
- label, number: '9'
- base: '9'
- shift: '('
- ctrl, alt, meta: none
-}
-
-key SPACE {
- label: ' '
- base: ' '
- ctrl, alt: none
- meta: fallback SEARCH
-}
-
-key ENTER {
- label: '\n'
- base: '\n'
- ctrl, alt, meta: none
-}
-
-key TAB {
- label: '\t'
- base: '\t'
- ctrl, alt: none
- meta: fallback APP_SWITCH
-}
-
-key COMMA {
- label, number: ','
- base: ','
- shift: '<'
- ctrl, alt, meta: none
-}
-
-key PERIOD {
- label, number: '.'
- base: '.'
- shift: '>'
- ctrl, alt, meta: none
-}
-
-key SLASH {
- label, number: '/'
- base: '/'
- shift: '?'
- ctrl, alt, meta: none
-}
-
-key GRAVE {
- label, number: '`'
- base: '`'
- shift: '~'
- alt: '\u0300'
- alt+shift: '\u0303'
- ctrl, meta: none
-}
-
-key MINUS {
- label, number: '-'
- base: '-'
- shift: '_'
- ctrl, alt, meta: none
-}
-
-key EQUALS {
- label, number: '='
- base: '='
- shift: '+'
- ctrl, alt, meta: none
-}
-
-key LEFT_BRACKET {
- label, number: '['
- base: '['
- shift: '{'
- ctrl, alt, meta: none
-}
-
-key RIGHT_BRACKET {
- label, number: ']'
- base: ']'
- shift: '}'
- ctrl, alt, meta: none
-}
-
-key BACKSLASH {
- label, number: '\\'
- base: '\\'
- shift: '|'
- ctrl, alt, meta: none
-}
-
-key SEMICOLON {
- label, number: ';'
- base: ';'
- shift: ':'
- ctrl, alt, meta: none
-}
-
-key APOSTROPHE {
- label, number: '\''
- base: '\''
- shift: '"'
- ctrl, alt, meta: none
-}
-
-### Numeric keypad ###
-
-key NUMPAD_0 {
- label, number: '0'
- base: fallback INSERT
- numlock: '0'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_1 {
- label, number: '1'
- base: fallback MOVE_END
- numlock: '1'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_2 {
- label, number: '2'
- base: fallback DPAD_DOWN
- numlock: '2'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_3 {
- label, number: '3'
- base: fallback PAGE_DOWN
- numlock: '3'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_4 {
- label, number: '4'
- base: fallback DPAD_LEFT
- numlock: '4'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_5 {
- label, number: '5'
- base: fallback DPAD_CENTER
- numlock: '5'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_6 {
- label, number: '6'
- base: fallback DPAD_RIGHT
- numlock: '6'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_7 {
- label, number: '7'
- base: fallback MOVE_HOME
- numlock: '7'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_8 {
- label, number: '8'
- base: fallback DPAD_UP
- numlock: '8'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_9 {
- label, number: '9'
- base: fallback PAGE_UP
- numlock: '9'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_LEFT_PAREN {
- label, number: '('
- base: '('
- ctrl, alt, meta: none
-}
-
-key NUMPAD_RIGHT_PAREN {
- label, number: ')'
- base: ')'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_DIVIDE {
- label, number: '/'
- base: '/'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_MULTIPLY {
- label, number: '*'
- base: '*'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_SUBTRACT {
- label, number: '-'
- base: '-'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_ADD {
- label, number: '+'
- base: '+'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_DOT {
- label, number: '.'
- base: fallback FORWARD_DEL
- numlock: '.'
- ctrl, alt, meta: none
-}
-
-key NUMPAD_COMMA {
- label, number: ','
- base: ','
- ctrl, alt, meta: none
-}
-
-key NUMPAD_EQUALS {
- label, number: '='
- base: '='
- ctrl, alt, meta: none
-}
-
-key NUMPAD_ENTER {
- label: '\n'
- base: '\n' fallback ENTER
- ctrl, alt, meta: none fallback ENTER
-}
-
-### Special keys on phones ###
-
-key AT {
- label, number: '@'
- base: '@'
-}
-
-key STAR {
- label, number: '*'
- base: '*'
-}
-
-key POUND {
- label, number: '#'
- base: '#'
-}
-
-key PLUS {
- label, number: '+'
- base: '+'
-}
-
-### Non-printing keys ###
-
-key ESCAPE {
- base: fallback BACK
- meta: fallback HOME
- alt: fallback MENU
-}
diff --git a/usr/keychars/qwerty.kcm b/usr/keychars/qwerty.kcm
deleted file mode 100644
index f3e1524..0000000
--- a/usr/keychars/qwerty.kcm
+++ /dev/null
@@ -1,508 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Emulator keyboard character map #1.
-#
-# This file is no longer used as the platform's default keyboard character map.
-# Refer to Generic.kcm and Virtual.kcm instead.
-#
-
-type ALPHA
-
-key A {
- label: 'A'
- number: '2'
- base: 'a'
- shift, capslock: 'A'
- alt: '#'
- shift+alt, capslock+alt: none
-}
-
-key B {
- label: 'B'
- number: '2'
- base: 'b'
- shift, capslock: 'B'
- alt: '<'
- shift+alt, capslock+alt: none
-}
-
-key C {
- label: 'C'
- number: '2'
- base: 'c'
- shift, capslock: 'C'
- alt: '9'
- shift+alt, capslock+alt: '\u00e7'
-}
-
-key D {
- label: 'D'
- number: '3'
- base: 'd'
- shift, capslock: 'D'
- alt: '5'
- shift+alt, capslock+alt: none
-}
-
-key E {
- label: 'E'
- number: '3'
- base: 'e'
- shift, capslock: 'E'
- alt: '2'
- shift+alt, capslock+alt: '\u0301'
-}
-
-key F {
- label: 'F'
- number: '3'
- base: 'f'
- shift, capslock: 'F'
- alt: '6'
- shift+alt, capslock+alt: '\u00a5'
-}
-
-key G {
- label: 'G'
- number: '4'
- base: 'g'
- shift, capslock: 'G'
- alt: '-'
- shift+alt, capslock+alt: '_'
-}
-
-key H {
- label: 'H'
- number: '4'
- base: 'h'
- shift, capslock: 'H'
- alt: '['
- shift+alt, capslock+alt: '{'
-}
-
-key I {
- label: 'I'
- number: '4'
- base: 'i'
- shift, capslock: 'I'
- alt: '$'
- shift+alt, capslock+alt: '\u0302'
-}
-
-key J {
- label: 'J'
- number: '5'
- base: 'j'
- shift, capslock: 'J'
- alt: ']'
- shift+alt, capslock+alt: '}'
-}
-
-key K {
- label: 'K'
- number: '5'
- base: 'k'
- shift, capslock: 'K'
- alt: '"'
- shift+alt, capslock+alt: '~'
-}
-
-key L {
- label: 'L'
- number: '5'
- base: 'l'
- shift, capslock: 'L'
- alt: '\''
- shift+alt, capslock+alt: '`'
-}
-
-key M {
- label: 'M'
- number: '6'
- base: 'm'
- shift, capslock: 'M'
- alt: '!'
- shift+alt, capslock+alt: none
-}
-
-key N {
- label: 'N'
- number: '6'
- base: 'n'
- shift, capslock: 'N'
- alt: '>'
- shift+alt, capslock+alt: '\u0303'
-}
-
-key O {
- label: 'O'
- number: '6'
- base: 'o'
- shift, capslock: 'O'
- alt: '('
- shift+alt, capslock+alt: none
-}
-
-key P {
- label: 'P'
- number: '7'
- base: 'p'
- shift, capslock: 'P'
- alt: ')'
- shift+alt, capslock+alt: none
-}
-
-key Q {
- label: 'Q'
- number: '7'
- base: 'q'
- shift, capslock: 'Q'
- alt: '*'
- shift+alt, capslock+alt: '\u0300'
-}
-
-key R {
- label: 'R'
- number: '7'
- base: 'r'
- shift, capslock: 'R'
- alt: '3'
- shift+alt, capslock+alt: '\u20ac'
-}
-
-key S {
- label: 'S'
- number: '7'
- base: 's'
- shift, capslock: 'S'
- alt: '4'
- shift+alt, capslock+alt: '\u00df'
-}
-
-key T {
- label: 'T'
- number: '8'
- base: 't'
- shift, capslock: 'T'
- alt: '+'
- shift+alt, capslock+alt: '\u00a3'
-}
-
-key U {
- label: 'U'
- number: '8'
- base: 'u'
- shift, capslock: 'U'
- alt: '&'
- shift+alt, capslock+alt: '\u0308'
-}
-
-key V {
- label: 'V'
- number: '8'
- base: 'v'
- shift, capslock: 'V'
- alt: '='
- shift+alt, capslock+alt: '^'
-}
-
-key W {
- label: 'W'
- number: '9'
- base: 'w'
- shift, capslock: 'W'
- alt: '1'
- shift+alt, capslock+alt: none
-}
-
-key X {
- label: 'X'
- number: '9'
- base: 'x'
- shift, capslock: 'X'
- alt: '8'
- shift+alt, capslock+alt: '\uef00'
-}
-
-key Y {
- label: 'Y'
- number: '9'
- base: 'y'
- shift, capslock: 'Y'
- alt: '%'
- shift+alt, capslock+alt: '\u00a1'
-}
-
-key Z {
- label: 'Z'
- number: '9'
- base: 'z'
- shift, capslock: 'Z'
- alt: '7'
- shift+alt, capslock+alt: none
-}
-
-key COMMA {
- label: ','
- number: ','
- base: ','
- shift: ';'
- alt: ';'
- shift+alt: '|'
-}
-
-key PERIOD {
- label: '.'
- number: '.'
- base: '.'
- shift: ':'
- alt: ':'
- shift+alt: '\u2026'
-}
-
-key AT {
- label: '@'
- number: '0'
- base: '@'
- shift: '0'
- alt: '0'
- shift+alt: '\u2022'
-}
-
-key SLASH {
- label: '/'
- number: '/'
- base: '/'
- shift: '?'
- alt: '?'
- shift+alt: '\\'
-}
-
-key SPACE {
- label: ' '
- number: ' '
- base: ' '
- shift: ' '
- alt: '\uef01'
- shift+alt: '\uef01'
-}
-
-key ENTER {
- label: '\n'
- number: '\n'
- base: '\n'
- shift: '\n'
- alt: '\n'
- shift+alt: '\n'
-}
-
-key TAB {
- label: '\t'
- number: '\t'
- base: '\t'
- shift: '\t'
- alt: '\t'
- shift+alt: '\t'
-}
-
-key 0 {
- label: '0'
- number: '0'
- base: '0'
- shift: ')'
- alt: ')'
- shift+alt: ')'
-}
-
-key 1 {
- label: '1'
- number: '1'
- base: '1'
- shift: '!'
- alt: '!'
- shift+alt: '!'
-}
-
-key 2 {
- label: '2'
- number: '2'
- base: '2'
- shift: '@'
- alt: '@'
- shift+alt: '@'
-}
-
-key 3 {
- label: '3'
- number: '3'
- base: '3'
- shift: '#'
- alt: '#'
- shift+alt: '#'
-}
-
-key 4 {
- label: '4'
- number: '4'
- base: '4'
- shift: '$'
- alt: '$'
- shift+alt: '$'
-}
-
-key 5 {
- label: '5'
- number: '5'
- base: '5'
- shift: '%'
- alt: '%'
- shift+alt: '%'
-}
-
-key 6 {
- label: '6'
- number: '6'
- base: '6'
- shift: '^'
- alt: '^'
- shift+alt: '^'
-}
-
-key 7 {
- label: '7'
- number: '7'
- base: '7'
- shift: '&'
- alt: '&'
- shift+alt: '&'
-}
-
-key 8 {
- label: '8'
- number: '8'
- base: '8'
- shift: '*'
- alt: '*'
- shift+alt: '*'
-}
-
-key 9 {
- label: '9'
- number: '9'
- base: '9'
- shift: '('
- alt: '('
- shift+alt: '('
-}
-
-key GRAVE {
- label: '`'
- number: '`'
- base: '`'
- shift: '~'
- alt: '`'
- shift+alt: '~'
-}
-
-key MINUS {
- label: '-'
- number: '-'
- base: '-'
- shift: '_'
- alt: '-'
- shift+alt: '_'
-}
-
-key EQUALS {
- label: '='
- number: '='
- base: '='
- shift: '+'
- alt: '='
- shift+alt: '+'
-}
-
-key LEFT_BRACKET {
- label: '['
- number: '['
- base: '['
- shift: '{'
- alt: '['
- shift+alt: '{'
-}
-
-key RIGHT_BRACKET {
- label: ']'
- number: ']'
- base: ']'
- shift: '}'
- alt: ']'
- shift+alt: '}'
-}
-
-key BACKSLASH {
- label: '\\'
- number: '\\'
- base: '\\'
- shift: '|'
- alt: '\\'
- shift+alt: '|'
-}
-
-key SEMICOLON {
- label: ';'
- number: ';'
- base: ';'
- shift: ':'
- alt: ';'
- shift+alt: ':'
-}
-
-key APOSTROPHE {
- label: '\''
- number: '\''
- base: '\''
- shift: '"'
- alt: '\''
- shift+alt: '"'
-}
-
-key STAR {
- label: '*'
- number: '*'
- base: '*'
- shift: '*'
- alt: '*'
- shift+alt: '*'
-}
-
-key POUND {
- label: '#'
- number: '#'
- base: '#'
- shift: '#'
- alt: '#'
- shift+alt: '#'
-}
-
-key PLUS {
- label: '+'
- number: '+'
- base: '+'
- shift: '+'
- alt: '+'
- shift+alt: '+'
-}
diff --git a/usr/keychars/qwerty2.kcm b/usr/keychars/qwerty2.kcm
deleted file mode 100644
index d96914f..0000000
--- a/usr/keychars/qwerty2.kcm
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Emulator keyboard character map #2.
-#
-
-type ALPHA
-
-key A {
- label: 'A'
- number: '2'
- base: 'a'
- shift, capslock: 'A'
- alt: 'a'
- shift+alt, capslock+alt: 'A'
-}
-
-key B {
- label: 'B'
- number: '2'
- base: 'b'
- shift, capslock: 'B'
- alt: 'b'
- shift+alt, capslock+alt: 'B'
-}
-
-key C {
- label: 'C'
- number: '2'
- base: 'c'
- shift, capslock: 'C'
- alt: '\u00e7'
- shift+alt, capslock+alt: '\u00e7'
-}
-
-key D {
- label: 'D'
- number: '3'
- base: 'd'
- shift, capslock: 'D'
- alt: '\''
- shift+alt, capslock+alt: '\''
-}
-
-key E {
- label: 'E'
- number: '3'
- base: 'e'
- shift, capslock: 'E'
- alt: '"'
- shift+alt, capslock+alt: '\u0301'
-}
-
-key F {
- label: 'F'
- number: '3'
- base: 'f'
- shift, capslock: 'F'
- alt: '['
- shift+alt, capslock+alt: '['
-}
-
-key G {
- label: 'G'
- number: '4'
- base: 'g'
- shift, capslock: 'G'
- alt: ']'
- shift+alt, capslock+alt: ']'
-}
-
-key H {
- label: 'H'
- number: '4'
- base: 'h'
- shift, capslock: 'H'
- alt: '<'
- shift+alt, capslock+alt: '<'
-}
-
-key I {
- label: 'I'
- number: '4'
- base: 'i'
- shift, capslock: 'I'
- alt: '-'
- shift+alt, capslock+alt: '\u0302'
-}
-
-key J {
- label: 'J'
- number: '5'
- base: 'j'
- shift, capslock: 'J'
- alt: '>'
- shift+alt, capslock+alt: '>'
-}
-
-key K {
- label: 'K'
- number: '5'
- base: 'k'
- shift, capslock: 'K'
- alt: ';'
- shift+alt, capslock+alt: '~'
-}
-
-key L {
- label: 'L'
- number: '5'
- base: 'l'
- shift, capslock: 'L'
- alt: ':'
- shift+alt, capslock+alt: '`'
-}
-
-key M {
- label: 'M'
- number: '6'
- base: 'm'
- shift, capslock: 'M'
- alt: '%'
- shift+alt, capslock+alt: none
-}
-
-key N {
- label: 'N'
- number: '6'
- base: 'n'
- shift, capslock: 'N'
- alt: none
- shift+alt, capslock+alt: '\u0303'
-}
-
-key O {
- label: 'O'
- number: '6'
- base: 'o'
- shift, capslock: 'O'
- alt: '+'
- shift+alt, capslock+alt: '+'
-}
-
-key P {
- label: 'P'
- number: '7'
- base: 'p'
- shift, capslock: 'P'
- alt: '='
- shift+alt, capslock+alt: '\u00a5'
-}
-
-key Q {
- label: 'Q'
- number: '7'
- base: 'q'
- shift, capslock: 'Q'
- alt: '|'
- shift+alt, capslock+alt: '\u0300'
-}
-
-key R {
- label: 'R'
- number: '7'
- base: 'r'
- shift, capslock: 'R'
- alt: '`'
- shift+alt, capslock+alt: '\u20ac'
-}
-
-key S {
- label: 'S'
- number: '7'
- base: 's'
- shift, capslock: 'S'
- alt: '\\'
- shift+alt, capslock+alt: '\u00df'
-}
-
-key T {
- label: 'T'
- number: '8'
- base: 't'
- shift, capslock: 'T'
- alt: '{'
- shift+alt, capslock+alt: '\u00a3'
-}
-
-key U {
- label: 'U'
- number: '8'
- base: 'u'
- shift, capslock: 'U'
- alt: '_'
- shift+alt, capslock+alt: '\u0308'
-}
-
-key V {
- label: 'V'
- number: '8'
- base: 'v'
- shift, capslock: 'V'
- alt: 'v'
- shift+alt, capslock+alt: 'V'
-}
-
-key W {
- label: 'W'
- number: '9'
- base: 'w'
- shift, capslock: 'W'
- alt: '~'
- shift+alt, capslock+alt: '~'
-}
-
-key X {
- label: 'X'
- number: '9'
- base: 'x'
- shift, capslock: 'X'
- alt: 'x'
- shift+alt, capslock+alt: '\uef00'
-}
-
-key Y {
- label: 'Y'
- number: '9'
- base: 'y'
- shift, capslock: 'Y'
- alt: '}'
- shift+alt, capslock+alt: '\u00a1'
-}
-
-key Z {
- label: 'Z'
- number: '9'
- base: 'z'
- shift, capslock: 'Z'
- alt: 'z'
- shift+alt, capslock+alt: 'Z'
-}
-
-key COMMA {
- label: ','
- number: ','
- base: ','
- shift: '<'
- alt: ','
- shift+alt: ','
-}
-
-key PERIOD {
- label: '.'
- number: '.'
- base: '.'
- shift: '>'
- alt: '.'
- shift+alt: '\u2026'
-}
-
-key AT {
- label: '@'
- number: '@'
- base: '@'
- shift: '@'
- alt: '@'
- shift+alt: '\u2022'
-}
-
-key SLASH {
- label: '/'
- number: '/'
- base: '/'
- shift: '?'
- alt: '?'
- shift+alt: '?'
-}
-
-key SPACE {
- label: ' '
- number: ' '
- base: ' '
- shift: ' '
- alt: '\uef01'
- shift+alt: '\uef01'
-}
-
-key ENTER {
- label: '\n'
- number: '\n'
- base: '\n'
- shift: '\n'
- alt: '\n'
- shift+alt: '\n'
-}
-
-key TAB {
- label: '\t'
- number: '\t'
- base: '\t'
- shift: '\t'
- alt: '\t'
- shift+alt: '\t'
-}
-
-key 0 {
- label: '0'
- number: '0'
- base: '0'
- shift: ')'
- alt: ')'
- shift+alt: ')'
-}
-
-key 1 {
- label: '1'
- number: '1'
- base: '1'
- shift: '!'
- alt: '!'
- shift+alt: '!'
-}
-
-key 2 {
- label: '2'
- number: '2'
- base: '2'
- shift: '@'
- alt: '@'
- shift+alt: '@'
-}
-
-key 3 {
- label: '3'
- number: '3'
- base: '3'
- shift: '#'
- alt: '#'
- shift+alt: '#'
-}
-
-key 4 {
- label: '4'
- number: '4'
- base: '4'
- shift: '$'
- alt: '$'
- shift+alt: '$'
-}
-
-key 5 {
- label: '5'
- number: '5'
- base: '5'
- shift: '%'
- alt: '%'
- shift+alt: '%'
-}
-
-key 6 {
- label: '6'
- number: '6'
- base: '6'
- shift: '^'
- alt: '^'
- shift+alt: '^'
-}
-
-key 7 {
- label: '7'
- number: '7'
- base: '7'
- shift: '&'
- alt: '&'
- shift+alt: '&'
-}
-
-key 8 {
- label: '8'
- number: '8'
- base: '8'
- shift: '*'
- alt: '*'
- shift+alt: '*'
-}
-
-key 9 {
- label: '9'
- number: '9'
- base: '9'
- shift: '('
- alt: '('
- shift+alt: '('
-}
-
-key GRAVE {
- label: '`'
- number: '`'
- base: '`'
- shift: '~'
- alt: '`'
- shift+alt: '~'
-}
-
-key MINUS {
- label: '-'
- number: '-'
- base: '-'
- shift: '_'
- alt: '-'
- shift+alt: '_'
-}
-
-key EQUALS {
- label: '='
- number: '='
- base: '='
- shift: '+'
- alt: '='
- shift+alt: '+'
-}
-
-key LEFT_BRACKET {
- label: '['
- number: '['
- base: '['
- shift: '{'
- alt: '['
- shift+alt: '{'
-}
-
-key RIGHT_BRACKET {
- label: ']'
- number: ']'
- base: ']'
- shift: '}'
- alt: ']'
- shift+alt: '}'
-}
-
-key BACKSLASH {
- label: '\\'
- number: '\\'
- base: '\\'
- shift: '|'
- alt: '\\'
- shift+alt: '|'
-}
-
-key SEMICOLON {
- label: ';'
- number: ';'
- base: ';'
- shift: ':'
- alt: ';'
- shift+alt: ':'
-}
-
-key APOSTROPHE {
- label: '\''
- number: '\''
- base: '\''
- shift: '"'
- alt: '\''
- shift+alt: '"'
-}
-
-key STAR {
- label: '*'
- number: '*'
- base: '*'
- shift: '*'
- alt: '*'
- shift+alt: '*'
-}
-
-key POUND {
- label: '#'
- number: '#'
- base: '#'
- shift: '#'
- alt: '#'
- shift+alt: '#'
-}
-
-key PLUS {
- label: '+'
- number: '+'
- base: '+'
- shift: '+'
- alt: '+'
- shift+alt: '+'
-}
diff --git a/usr/keylayout/AVRCP.kl b/usr/keylayout/AVRCP.kl
deleted file mode 100644
index 736b43c..0000000
--- a/usr/keylayout/AVRCP.kl
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Key layout used for Bluetooth AVRCP support.
-
-key 200 MEDIA_PLAY WAKE
-key 201 MEDIA_PAUSE WAKE
-key 166 MEDIA_STOP WAKE
-key 163 MEDIA_NEXT WAKE
-key 165 MEDIA_PREVIOUS WAKE
-key 168 MEDIA_REWIND WAKE
-key 208 MEDIA_FAST_FORWARD WAKE
diff --git a/usr/keylayout/Generic.kl b/usr/keylayout/Generic.kl
deleted file mode 100644
index 10de6ac..0000000
--- a/usr/keylayout/Generic.kl
+++ /dev/null
@@ -1,421 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Generic key layout file for full alphabetic US English PC style external keyboards.
-#
-# This file is intentionally very generic and is intended to support a broad rang of keyboards.
-# Do not edit the generic key layout to support a specific keyboard; instead, create
-# a new key layout file with the required keyboard configuration.
-#
-
-key 1 ESCAPE
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 12 MINUS
-key 13 EQUALS
-key 14 DEL
-key 15 TAB
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 28 ENTER
-key 29 CTRL_LEFT
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 41 GRAVE
-key 42 SHIFT_LEFT
-key 43 BACKSLASH
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 54 SHIFT_RIGHT
-key 55 NUMPAD_MULTIPLY
-key 56 ALT_LEFT
-key 57 SPACE
-key 58 CAPS_LOCK
-key 59 F1
-key 60 F2
-key 61 F3
-key 62 F4
-key 63 F5
-key 64 F6
-key 65 F7
-key 66 F8
-key 67 F9
-key 68 F10
-key 69 NUM_LOCK
-key 70 SCROLL_LOCK
-key 71 NUMPAD_7
-key 72 NUMPAD_8
-key 73 NUMPAD_9
-key 74 NUMPAD_SUBTRACT
-key 75 NUMPAD_4
-key 76 NUMPAD_5
-key 77 NUMPAD_6
-key 78 NUMPAD_ADD
-key 79 NUMPAD_1
-key 80 NUMPAD_2
-key 81 NUMPAD_3
-key 82 NUMPAD_0
-key 83 NUMPAD_DOT
-# key 84 (undefined)
-# key 85 "KEY_ZENKAKUHANKAKU"
-key 86 BACKSLASH
-key 87 F11
-key 88 F12
-# key 89 "KEY_RO"
-# key 90 "KEY_KATAKANA"
-# key 91 "KEY_HIRAGANA"
-# key 92 "KEY_HENKAN"
-# key 93 "KEY_KATAKANAHIRAGANA"
-# key 94 "KEY_MUHENKAN"
-key 95 NUMPAD_COMMA
-key 96 NUMPAD_ENTER
-key 97 CTRL_RIGHT
-key 98 NUMPAD_DIVIDE
-key 99 SYSRQ
-key 100 ALT_RIGHT
-# key 101 "KEY_LINEFEED"
-key 102 MOVE_HOME
-key 103 DPAD_UP
-key 104 PAGE_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 107 MOVE_END
-key 108 DPAD_DOWN
-key 109 PAGE_DOWN
-key 110 INSERT
-key 111 FORWARD_DEL
-# key 112 "KEY_MACRO"
-key 113 VOLUME_MUTE
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 116 POWER WAKE
-key 117 NUMPAD_EQUALS
-# key 118 "KEY_KPPLUSMINUS"
-key 119 BREAK
-# key 120 (undefined)
-key 121 NUMPAD_COMMA
-# key 122 "KEY_HANGEUL"
-# key 123 "KEY_HANJA"
-# key 124 "KEY_YEN"
-key 125 META_LEFT
-key 126 META_RIGHT
-key 127 MENU WAKE_DROPPED
-key 128 MEDIA_STOP
-# key 129 "KEY_AGAIN"
-# key 130 "KEY_PROPS"
-# key 131 "KEY_UNDO"
-# key 132 "KEY_FRONT"
-# key 133 "KEY_COPY"
-# key 134 "KEY_OPEN"
-# key 135 "KEY_PASTE"
-# key 136 "KEY_FIND"
-# key 137 "KEY_CUT"
-# key 138 "KEY_HELP"
-key 139 MENU WAKE_DROPPED
-# key 140 "KEY_CALC"
-# key 141 "KEY_SETUP"
-key 142 POWER WAKE
-key 143 POWER WAKE
-# key 144 "KEY_FILE"
-# key 145 "KEY_SENDFILE"
-# key 146 "KEY_DELETEFILE"
-# key 147 "KEY_XFER"
-# key 148 "KEY_PROG1"
-# key 149 "KEY_PROG2"
-key 150 EXPLORER
-# key 151 "KEY_MSDOS"
-key 152 POWER WAKE
-# key 153 "KEY_DIRECTION"
-# key 154 "KEY_CYCLEWINDOWS"
-key 155 ENVELOPE
-key 156 BOOKMARK
-# key 157 "KEY_COMPUTER"
-key 158 BACK WAKE_DROPPED
-key 159 FORWARD
-key 160 MEDIA_CLOSE
-key 161 MEDIA_EJECT
-key 162 MEDIA_EJECT
-key 163 MEDIA_NEXT
-key 164 MEDIA_PLAY_PAUSE
-key 165 MEDIA_PREVIOUS
-key 166 MEDIA_STOP
-key 167 MEDIA_RECORD
-key 168 MEDIA_REWIND
-key 169 CALL
-# key 170 "KEY_ISO"
-# key 171 "KEY_CONFIG"
-key 172 HOME
-# key 173 "KEY_REFRESH"
-# key 174 "KEY_EXIT"
-# key 175 "KEY_MOVE"
-# key 176 "KEY_EDIT"
-key 177 PAGE_UP
-key 178 PAGE_DOWN
-key 179 NUMPAD_LEFT_PAREN
-key 180 NUMPAD_RIGHT_PAREN
-# key 181 "KEY_NEW"
-# key 182 "KEY_REDO"
-# key 183 F13
-# key 184 F14
-# key 185 F15
-# key 186 F16
-# key 187 F17
-# key 188 F18
-# key 189 F19
-# key 190 F20
-# key 191 F21
-# key 192 F22
-# key 193 F23
-# key 194 F24
-# key 195 (undefined)
-# key 196 (undefined)
-# key 197 (undefined)
-# key 198 (undefined)
-# key 199 (undefined)
-key 200 MEDIA_PLAY
-key 201 MEDIA_PAUSE
-# key 202 "KEY_PROG3"
-# key 203 "KEY_PROG4"
-# key 204 (undefined)
-# key 205 "KEY_SUSPEND"
-# key 206 "KEY_CLOSE"
-key 207 MEDIA_PLAY
-key 208 MEDIA_FAST_FORWARD
-# key 209 "KEY_BASSBOOST"
-# key 210 "KEY_PRINT"
-# key 211 "KEY_HP"
-key 212 CAMERA
-# key 213 "KEY_SOUND"
-# key 214 "KEY_QUESTION"
-key 215 ENVELOPE
-# key 216 "KEY_CHAT"
-key 217 SEARCH
-# key 218 "KEY_CONNECT"
-# key 219 "KEY_FINANCE"
-# key 220 "KEY_SPORT"
-# key 221 "KEY_SHOP"
-# key 222 "KEY_ALTERASE"
-# key 223 "KEY_CANCEL"
-# key 224 "KEY_BRIGHTNESSDOWN"
-# key 225 "KEY_BRIGHTNESSUP"
-key 226 HEADSETHOOK
-
-key 256 BUTTON_1
-key 257 BUTTON_2
-key 258 BUTTON_3
-key 259 BUTTON_4
-key 260 BUTTON_5
-key 261 BUTTON_6
-key 262 BUTTON_7
-key 263 BUTTON_8
-key 264 BUTTON_9
-key 265 BUTTON_10
-key 266 BUTTON_11
-key 267 BUTTON_12
-key 268 BUTTON_13
-key 269 BUTTON_14
-key 270 BUTTON_15
-key 271 BUTTON_16
-
-key 288 BUTTON_1
-key 289 BUTTON_2
-key 290 BUTTON_3
-key 291 BUTTON_4
-key 292 BUTTON_5
-key 293 BUTTON_6
-key 294 BUTTON_7
-key 295 BUTTON_8
-key 296 BUTTON_9
-key 297 BUTTON_10
-key 298 BUTTON_11
-key 299 BUTTON_12
-key 300 BUTTON_13
-key 301 BUTTON_14
-key 302 BUTTON_15
-key 303 BUTTON_16
-
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 306 BUTTON_C
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 309 BUTTON_Z
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 312 BUTTON_L2
-key 313 BUTTON_R2
-key 314 BUTTON_SELECT
-key 315 BUTTON_START
-key 316 BUTTON_MODE
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-
-# key 352 "KEY_OK"
-# key 353 "KEY_SELECT"
-# key 354 "KEY_GOTO"
-# key 355 "KEY_CLEAR"
-# key 356 "KEY_POWER2"
-# key 357 "KEY_OPTION"
-# key 358 "KEY_INFO"
-# key 359 "KEY_TIME"
-# key 360 "KEY_VENDOR"
-# key 361 "KEY_ARCHIVE"
-key 362 GUIDE
-# key 363 "KEY_CHANNEL"
-# key 364 "KEY_FAVORITES"
-# key 365 "KEY_EPG"
-key 366 DVR
-# key 367 "KEY_MHP"
-# key 368 "KEY_LANGUAGE"
-# key 369 "KEY_TITLE"
-# key 370 "KEY_SUBTITLE"
-# key 371 "KEY_ANGLE"
-# key 372 "KEY_ZOOM"
-# key 373 "KEY_MODE"
-# key 374 "KEY_KEYBOARD"
-# key 375 "KEY_SCREEN"
-# key 376 "KEY_PC"
-key 377 TV
-# key 378 "KEY_TV2"
-# key 379 "KEY_VCR"
-# key 380 "KEY_VCR2"
-# key 381 "KEY_SAT"
-# key 382 "KEY_SAT2"
-# key 383 "KEY_CD"
-# key 384 "KEY_TAPE"
-# key 385 "KEY_RADIO"
-# key 386 "KEY_TUNER"
-# key 387 "KEY_PLAYER"
-# key 388 "KEY_TEXT"
-# key 389 "KEY_DVD"
-# key 390 "KEY_AUX"
-# key 391 "KEY_MP3"
-# key 392 "KEY_AUDIO"
-# key 393 "KEY_VIDEO"
-# key 394 "KEY_DIRECTORY"
-# key 395 "KEY_LIST"
-# key 396 "KEY_MEMO"
-# key 397 "KEY_CALENDAR"
-# key 398 "KEY_RED"
-# key 399 "KEY_GREEN"
-# key 400 "KEY_YELLOW"
-# key 401 "KEY_BLUE"
-key 402 CHANNEL_UP
-key 403 CHANNEL_DOWN
-# key 404 "KEY_FIRST"
-# key 405 "KEY_LAST"
-# key 406 "KEY_AB"
-# key 407 "KEY_NEXT"
-# key 408 "KEY_RESTART"
-# key 409 "KEY_SLOW"
-# key 410 "KEY_SHUFFLE"
-# key 411 "KEY_BREAK"
-# key 412 "KEY_PREVIOUS"
-# key 413 "KEY_DIGITS"
-# key 414 "KEY_TEEN"
-# key 415 "KEY_TWEN"
-
-
-# key 448 "KEY_DEL_EOL"
-# key 449 "KEY_DEL_EOS"
-# key 450 "KEY_INS_LINE"
-# key 451 "KEY_DEL_LINE"
-
-
-key 464 FUNCTION
-key 465 ESCAPE FUNCTION
-key 466 F1 FUNCTION
-key 467 F2 FUNCTION
-key 468 F3 FUNCTION
-key 469 F4 FUNCTION
-key 470 F5 FUNCTION
-key 471 F6 FUNCTION
-key 472 F7 FUNCTION
-key 473 F8 FUNCTION
-key 474 F9 FUNCTION
-key 475 F10 FUNCTION
-key 476 F11 FUNCTION
-key 477 F12 FUNCTION
-key 478 1 FUNCTION
-key 479 2 FUNCTION
-key 480 D FUNCTION
-key 481 E FUNCTION
-key 482 F FUNCTION
-key 483 S FUNCTION
-key 484 B FUNCTION
-
-
-# key 497 KEY_BRL_DOT1
-# key 498 KEY_BRL_DOT2
-# key 499 KEY_BRL_DOT3
-# key 500 KEY_BRL_DOT4
-# key 501 KEY_BRL_DOT5
-# key 502 KEY_BRL_DOT6
-# key 503 KEY_BRL_DOT7
-# key 504 KEY_BRL_DOT8
-
-
-# Joystick and game controller axes.
-# Axes that are not mapped will be assigned generic axis numbers by the input subsystem.
-axis 0x00 X
-axis 0x01 Y
-axis 0x02 Z
-axis 0x03 RX
-axis 0x04 RY
-axis 0x05 RZ
-axis 0x06 THROTTLE
-axis 0x07 RUDDER
-axis 0x08 WHEEL
-axis 0x09 GAS
-axis 0x0a BRAKE
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/usr/keylayout/Vendor_045e_Product_028e.kl b/usr/keylayout/Vendor_045e_Product_028e.kl
deleted file mode 100644
index 99f046a..0000000
--- a/usr/keylayout/Vendor_045e_Product_028e.kl
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# XBox 360 USB Controller
-#
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 314 BUTTON_SELECT
-key 315 BUTTON_START
-key 316 BUTTON_MODE
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-# Left and right stick.
-# The reported value for flat is 128 out of a range from -32767 to 32768, which is absurd.
-# This confuses applications that rely on the flat value because the joystick actually
-# settles in a flat range of +/- 4096 or so.
-axis 0x00 X flat 4096
-axis 0x01 Y flat 4096
-axis 0x03 Z flat 4096
-axis 0x04 RZ flat 4096
-
-# Triggers.
-axis 0x02 LTRIGGER
-axis 0x05 RTRIGGER
-
-# Hat.
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/usr/keylayout/Vendor_046d_Product_c216.kl b/usr/keylayout/Vendor_046d_Product_c216.kl
deleted file mode 100644
index 6743323..0000000
--- a/usr/keylayout/Vendor_046d_Product_c216.kl
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Logitech Dual Action Controller
-#
-
-key 0x120 BUTTON_A
-key 0x123 BUTTON_B
-key 0x121 BUTTON_X
-key 0x122 BUTTON_Y
-key 0x124 BUTTON_L1
-key 0x125 BUTTON_R1
-key 0x126 BUTTON_L2
-key 0x127 BUTTON_R2
-key 0x128 BUTTON_SELECT
-key 0x129 BUTTON_START
-key 0x12a BUTTON_THUMBL
-key 0x12b BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x02 Z
-axis 0x05 RZ
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/usr/keylayout/Vendor_046d_Product_c294.kl b/usr/keylayout/Vendor_046d_Product_c294.kl
deleted file mode 100644
index 5492f49..0000000
--- a/usr/keylayout/Vendor_046d_Product_c294.kl
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Logitech G25 Racing Wheel (in Compatibility Mode)
-#
-
-# 4 way buttons above hat
-key 0x121 BUTTON_A
-key 0x123 BUTTON_B
-key 0x120 BUTTON_X
-key 0x122 BUTTON_Y
-
-# Row of buttons under hat
-key 0x12b BUTTON_1
-key 0x128 BUTTON_2
-key 0x129 BUTTON_3
-key 0x12a BUTTON_4
-
-# Gear shift positions
-# 0x12a top-left gear (aliased as BUTTON_4)
-# 0x12b bottom-left gear (aliased as BUTTON_1)
-
-# Buttons on wheel
-key 0x127 BUTTON_L1
-key 0x126 BUTTON_R1
-
-# Toggles under wheel
-key 0x125 BUTTON_L2
-key 0x124 BUTTON_R2
-
-# Hat
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
-
-# Steering Wheel
-axis 0x00 WHEEL
-
-# Accelerator / Brake
-# 00..7e : accelerator
-# 80..ff : brake
-axis 0x01 split 0x7f GAS BRAKE
diff --git a/usr/keylayout/Vendor_046d_Product_c299.kl b/usr/keylayout/Vendor_046d_Product_c299.kl
deleted file mode 100644
index d42963d..0000000
--- a/usr/keylayout/Vendor_046d_Product_c299.kl
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Logitech G25 Racing Wheel (in Native Mode)
-#
-
-# 4 way buttons above hat
-key 0x121 BUTTON_A
-key 0x123 BUTTON_B
-key 0x120 BUTTON_X
-key 0x122 BUTTON_Y
-
-# Row of buttons under hat
-key 0x12b BUTTON_1
-key 0x128 BUTTON_2
-key 0x129 BUTTON_3
-key 0x12a BUTTON_4
-
-# Gear shift positions
-key 0x12c BUTTON_5
-key 0x12d BUTTON_6
-key 0x12e BUTTON_7
-key 0x12f BUTTON_8
-key 0x2d0 BUTTON_9
-key 0x2d1 BUTTON_10
-key 0x2d2 BUTTON_11
-
-# Buttons on wheel
-key 0x127 BUTTON_L1
-key 0x126 BUTTON_R1
-
-# Toggles under wheel
-key 0x125 BUTTON_L2
-key 0x124 BUTTON_R2
-
-# Hat
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
-
-# Steering Wheel
-axis 0x00 WHEEL
-
-# Clutch
-axis 0x01 invert GENERIC_1
-
-# Accelerator
-axis 0x02 invert GAS
-
-# Brake
-axis 0x05 invert BRAKE
diff --git a/usr/keylayout/Vendor_046d_Product_c532.kl b/usr/keylayout/Vendor_046d_Product_c532.kl
deleted file mode 100644
index 741c2e1..0000000
--- a/usr/keylayout/Vendor_046d_Product_c532.kl
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Logitech Revue Wireless keyboard
-#
-# Notes:
-# - The GRAVE key is emulated by the keyboard.
-# ALT + LEFT_BRACKET produces GRAVE.
-# ALT + RIGHT_BRACKET produces SHIFT + GRAVE.
-# - FORWARD_DEL is produced by fn + BACKSPACE
-# - PAGE_UP / PAGE_DOWN is produced by fn + CHANNEL_UP / CHANNEL_DOWN
-# - The AVR / STB / TV power and input buttons seem to be non-functional
-# as well as several of the other fn buttons and the PIP button?
-
-key 1 ESCAPE
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 12 MINUS
-key 13 EQUALS
-key 14 DEL
-key 15 TAB
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 28 ENTER
-key 29 CTRL_LEFT
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 41 GRAVE
-key 42 SHIFT_LEFT
-key 43 BACKSLASH
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 54 SHIFT_RIGHT
-key 56 ALT_RIGHT
-key 57 SPACE
-key 58 CAPS_LOCK
-key 59 F1
-key 60 F2
-key 61 F3
-key 62 F4
-key 63 F5
-key 64 F6
-key 65 F7
-key 66 F8
-key 67 F9
-key 68 F10
-key 87 F11
-key 88 F12
-key 96 DPAD_CENTER
-key 97 CTRL_RIGHT
-key 102 MOVE_HOME
-key 103 DPAD_UP
-key 104 PAGE_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 107 MOVE_END
-key 108 DPAD_DOWN
-key 109 PAGE_DOWN
-key 110 NUMPAD_ENTER
-key 111 FORWARD_DEL
-key 113 VOLUME_MUTE
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 119 MEDIA_PAUSE
-key 125 SEARCH
-key 127 MENU
-key 156 BOOKMARK
-key 158 BACK
-key 163 MEDIA_NEXT
-key 165 MEDIA_PREVIOUS
-key 166 MEDIA_STOP
-key 167 MEDIA_RECORD
-key 168 MEDIA_REWIND
-key 172 HOME
-key 207 MEDIA_PLAY
-key 208 MEDIA_FAST_FORWARD
-# key 288 left mouse button
-# key 289 right mouse button (fn + button)
-key 362 GUIDE
-key 366 DVR
-key 377 TV
-key 402 CHANNEL_UP
-key 403 CHANNEL_DOWN
-key 418 ZOOM_IN
-key 419 ZOOM_OUT
-
diff --git a/usr/keylayout/Vendor_054c_Product_0268.kl b/usr/keylayout/Vendor_054c_Product_0268.kl
deleted file mode 100644
index f8ac6a3..0000000
--- a/usr/keylayout/Vendor_054c_Product_0268.kl
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Sony Playstation(R)3 Controller
-#
-
-key 0x124 DPAD_UP
-key 0x125 DPAD_RIGHT
-key 0x126 DPAD_DOWN
-key 0x127 DPAD_LEFT
-
-key 0x120 BUTTON_SELECT
-key 0x123 BUTTON_START
-key 0x12f BUTTON_A
-key 0x12c BUTTON_B
-key 0x12e BUTTON_X
-key 0x12d BUTTON_Y
-key 0x12a BUTTON_L1
-key 0x12b BUTTON_R1
-key 0x128 BUTTON_L2
-key 0x129 BUTTON_R2
-key 0x121 BUTTON_THUMBL
-key 0x122 BUTTON_THUMBR
-
-# PS key
-key 0x2d0 BUTTON_1
-
-# Left Analog Stick
-axis 0x00 X
-axis 0x01 Y
-
-# Right Analog Stick
-axis 0x02 Z
-axis 0x05 RZ
-
-# DPAD
-# axis 0x2c -HAT_Y
-# axis 0x2d +HAT_X
-# axis 0x2e +HAT_Y
-# axis 0x2f -HAT_X
-
-# L2 trigger
-axis 0x30 LTRIGGER
-
-# R2 trigger
-axis 0x31 RTRIGGER
-
-# L1 trigger
-# axis 0x32
-
-# R1 trigger
-# axis 0x33
-
-# Triangle
-# axis 0x34
-
-# Circle
-# axis 0x35
-
-# Cross
-# axis 0x36
-
-# Square
-# axis 0x37
diff --git a/usr/keylayout/Vendor_05ac_Product_0239.kl b/usr/keylayout/Vendor_05ac_Product_0239.kl
deleted file mode 100644
index 6bd3753..0000000
--- a/usr/keylayout/Vendor_05ac_Product_0239.kl
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Apple Wireless Keyboard
-#
-# Notes:
-# - Keys such as PAGE_UP and FORWARD_DEL are produced using the
-# function key.
-# - Special function keys for brightness control, etc. are not
-# implemented here.
-
-key 1 ESCAPE
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 12 MINUS
-key 13 EQUALS
-key 14 DEL
-key 15 TAB
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 28 ENTER
-key 29 CTRL_LEFT
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 41 GRAVE
-key 42 SHIFT_LEFT
-key 43 BACKSLASH
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 54 SHIFT_RIGHT
-key 56 ALT_LEFT
-key 57 SPACE
-key 58 CAPS_LOCK
-key 59 F1
-key 60 F2
-key 61 F3
-key 62 F4
-key 63 F5
-key 64 F6
-key 65 F7
-key 66 F8
-key 67 F9
-key 68 F10
-key 87 F11
-key 88 F12
-key 100 ALT_RIGHT
-key 102 MOVE_HOME
-key 103 DPAD_UP
-key 104 PAGE_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 107 MOVE_END
-key 108 DPAD_DOWN
-key 109 PAGE_DOWN
-key 110 NUMPAD_ENTER
-key 111 FORWARD_DEL
-key 113 VOLUME_MUTE
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 120 APP_SWITCH
-key 125 META_LEFT
-key 126 META_RIGHT
-key 161 MEDIA_EJECT
-key 163 MEDIA_NEXT
-key 164 MEDIA_PLAY_PAUSE
-key 165 MEDIA_PREVIOUS
-# key 204 show gadgets
-# key 224 reduce brightness
-# key 225 increase brightness
-# key 229 blank special function on F5
-# key 230 blank special function on F6
-key 464 FUNCTION
diff --git a/usr/keylayout/Vendor_22b8_Product_093d.kl b/usr/keylayout/Vendor_22b8_Product_093d.kl
deleted file mode 100644
index 2749c5b..0000000
--- a/usr/keylayout/Vendor_22b8_Product_093d.kl
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Motorola Bluetooth Wireless Keyboard.
-#
-
-key 1 BACK
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 12 MINUS
-key 13 EQUALS
-key 14 DEL
-key 15 TAB
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 28 ENTER
-key 29 CTRL_LEFT
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 41 GRAVE
-key 42 SHIFT_LEFT
-key 43 BACKSLASH
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 54 SHIFT_RIGHT
-key 56 ALT_LEFT
-key 57 SPACE
-key 58 CAPS_LOCK
-key 59 F1
-key 60 F2
-key 61 F3
-key 62 F4
-key 63 F5
-key 64 F6
-key 65 F7
-key 66 F8
-key 67 F9
-key 68 F10
-key 87 F11
-key 88 F12
-key 97 CTRL_RIGHT
-key 102 HOME
-key 103 DPAD_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 107 MOVE_END
-key 108 DPAD_DOWN
-key 111 FORWARD_DEL
-key 113 VOLUME_MUTE
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 125 MENU
-key 127 SEARCH
-key 163 MEDIA_NEXT
-key 164 MEDIA_PLAY_PAUSE
-key 165 MEDIA_PREVIOUS
-key 166 MEDIA_STOP
-# key 226 tbd reserved key
diff --git a/usr/keylayout/gpio-keys.kl b/usr/keylayout/gpio-keys.kl
index b7abd0b..e7413fe 100644
--- a/usr/keylayout/gpio-keys.kl
+++ b/usr/keylayout/gpio-keys.kl
@@ -1,11 +1,4 @@
-key 115 VOLUME_UP WAKE
-key 114 VOLUME_DOWN WAKE
-key 102 HOME WAKE
-key 107 ENDCALL
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 103 DPAD_UP
-key 108 DPAD_DOWN
-key 232 DPAD_CENTER
+key 115 VOLUME_UP WAKE
+key 114 VOLUME_DOWN WAKE
key 116 POWER WAKE
-key 212 CAMERA WAKE
+key 102 HOME WAKE
diff --git a/usr/keylayout/qwerty.kl b/usr/keylayout/qwerty.kl
deleted file mode 100644
index f1caacd..0000000
--- a/usr/keylayout/qwerty.kl
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Emulator keyboard layout #1.
-#
-# This file is no longer used as the platform's default keyboard layout.
-# Refer to Generic.kl instead.
-#
-
-key 399 GRAVE
-key 2 1
-key 3 2
-key 4 3
-key 5 4
-key 6 5
-key 7 6
-key 8 7
-key 9 8
-key 10 9
-key 11 0
-key 158 BACK WAKE_DROPPED
-key 230 SOFT_RIGHT WAKE
-key 60 SOFT_RIGHT WAKE
-key 107 ENDCALL WAKE_DROPPED
-key 62 ENDCALL WAKE_DROPPED
-key 229 MENU WAKE_DROPPED
-key 139 MENU WAKE_DROPPED
-key 59 MENU WAKE_DROPPED
-key 127 SEARCH WAKE_DROPPED
-key 217 SEARCH WAKE_DROPPED
-key 228 POUND
-key 227 STAR
-key 231 CALL WAKE_DROPPED
-key 61 CALL WAKE_DROPPED
-key 232 DPAD_CENTER WAKE_DROPPED
-key 108 DPAD_DOWN WAKE_DROPPED
-key 103 DPAD_UP WAKE_DROPPED
-key 102 HOME WAKE
-key 105 DPAD_LEFT WAKE_DROPPED
-key 106 DPAD_RIGHT WAKE_DROPPED
-key 115 VOLUME_UP WAKE
-key 114 VOLUME_DOWN WAKE
-key 116 POWER WAKE
-key 212 CAMERA
-
-key 16 Q
-key 17 W
-key 18 E
-key 19 R
-key 20 T
-key 21 Y
-key 22 U
-key 23 I
-key 24 O
-key 25 P
-key 26 LEFT_BRACKET
-key 27 RIGHT_BRACKET
-key 43 BACKSLASH
-
-key 30 A
-key 31 S
-key 32 D
-key 33 F
-key 34 G
-key 35 H
-key 36 J
-key 37 K
-key 38 L
-key 39 SEMICOLON
-key 40 APOSTROPHE
-key 14 DEL
-
-key 44 Z
-key 45 X
-key 46 C
-key 47 V
-key 48 B
-key 49 N
-key 50 M
-key 51 COMMA
-key 52 PERIOD
-key 53 SLASH
-key 28 ENTER
-
-key 56 ALT_LEFT
-key 100 ALT_RIGHT
-key 42 SHIFT_LEFT
-key 54 SHIFT_RIGHT
-key 15 TAB
-key 57 SPACE
-key 150 EXPLORER
-key 155 ENVELOPE
-
-key 12 MINUS
-key 13 EQUALS
-key 215 AT
-
-# On an AT keyboard: ESC, F10
-key 1 BACK WAKE_DROPPED
-key 68 MENU WAKE_DROPPED
diff --git a/usr/keylayout/sii9234_rcp.kl b/usr/keylayout/sii9234_rcp.kl
new file mode 100644
index 0000000..ae6c6a2
--- /dev/null
+++ b/usr/keylayout/sii9234_rcp.kl
@@ -0,0 +1,28 @@
+key 1 ENTER WAKE_DROPPED
+key 2 DPAD_UP WAKE_DROPPED
+key 3 DPAD_DOWN WAKE_DROPPED
+key 4 DPAD_LEFT WAKE_DROPPED
+key 5 DPAD_RIGHT WAKE_DROPPED
+key 10 MENU WAKE_DROPPED
+key 14 BACK WAKE_DROPPED
+
+key 33 0
+key 34 1
+key 35 2
+key 36 3
+key 37 4
+key 38 5
+key 39 6
+key 40 7
+key 41 8
+key 42 9
+
+key 45 DEL
+
+key 69 MEDIA_PLAY_PAUSE WAKE
+key 70 MEDIA_STOP WAKE
+key 71 MEDIA_PLAY_PAUSE WAKE
+key 73 MEDIA_REWIND WAKE
+key 74 MEDIA_FAST_FORWARD WAKE
+key 76 MEDIA_NEXT WAKE
+key 77 MEDIA_PREVIOUS WAKE