summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2014-04-22 15:03:48 -0700
committerMichael Wright <michaelwr@google.com>2014-04-28 14:33:40 -0700
commit337d9d2edc262141f9b8f684e53aae5e47f0ae13 (patch)
tree486f2c212e2084a2730cf670fa3a41d11c16b188 /data
parentb78263d37690a6a5cb12dd31d82ad2e140b3dfc7 (diff)
downloadframeworks_base-337d9d2edc262141f9b8f684e53aae5e47f0ae13.zip
frameworks_base-337d9d2edc262141f9b8f684e53aae5e47f0ae13.tar.gz
frameworks_base-337d9d2edc262141f9b8f684e53aae5e47f0ae13.tar.bz2
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
Diffstat (limited to 'data')
-rw-r--r--data/keyboards/AVRCP.kl14
-rw-r--r--data/keyboards/Generic.kl14
-rw-r--r--data/keyboards/Vendor_0a5c_Product_8502.kl2
-rw-r--r--data/keyboards/Vendor_18d1_Product_2c40.kl2
-rw-r--r--data/keyboards/qwerty.kl46
5 files changed, 39 insertions, 39 deletions
diff --git a/data/keyboards/AVRCP.kl b/data/keyboards/AVRCP.kl
index 736b43c..ccd0209 100644
--- a/data/keyboards/AVRCP.kl
+++ b/data/keyboards/AVRCP.kl
@@ -14,10 +14,10 @@
# 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
+key 200 MEDIA_PLAY
+key 201 MEDIA_PAUSE
+key 166 MEDIA_STOP
+key 163 MEDIA_NEXT
+key 165 MEDIA_PREVIOUS
+key 168 MEDIA_REWIND
+key 208 MEDIA_FAST_FORWARD
diff --git a/data/keyboards/Generic.kl b/data/keyboards/Generic.kl
index 0cdcb1c..56423c9 100644
--- a/data/keyboards/Generic.kl
+++ b/data/keyboards/Generic.kl
@@ -135,7 +135,7 @@ key 111 FORWARD_DEL
key 113 VOLUME_MUTE
key 114 VOLUME_DOWN
key 115 VOLUME_UP
-key 116 POWER WAKE
+key 116 POWER
key 117 NUMPAD_EQUALS
# key 118 "KEY_KPPLUSMINUS"
key 119 BREAK
@@ -146,7 +146,7 @@ key 123 EISU
key 124 YEN
key 125 META_LEFT
key 126 META_RIGHT
-key 127 MENU WAKE_DROPPED
+key 127 MENU
key 128 MEDIA_STOP
# key 129 "KEY_AGAIN"
# key 130 "KEY_PROPS"
@@ -158,11 +158,11 @@ key 128 MEDIA_STOP
# key 136 "KEY_FIND"
# key 137 "KEY_CUT"
# key 138 "KEY_HELP"
-key 139 MENU WAKE_DROPPED
+key 139 MENU
key 140 CALCULATOR
# key 141 "KEY_SETUP"
-key 142 SLEEP WAKE
-key 143 WAKEUP WAKE
+key 142 SLEEP
+key 143 WAKEUP
# key 144 "KEY_FILE"
# key 145 "KEY_SENDFILE"
# key 146 "KEY_DELETEFILE"
@@ -171,13 +171,13 @@ key 143 WAKEUP WAKE
# key 149 "KEY_PROG2"
key 150 EXPLORER
# key 151 "KEY_MSDOS"
-key 152 POWER WAKE
+key 152 POWER
# key 153 "KEY_DIRECTION"
# key 154 "KEY_CYCLEWINDOWS"
key 155 ENVELOPE
key 156 BOOKMARK
# key 157 "KEY_COMPUTER"
-key 158 BACK WAKE_DROPPED
+key 158 BACK
key 159 FORWARD
key 160 MEDIA_CLOSE
key 161 MEDIA_EJECT
diff --git a/data/keyboards/Vendor_0a5c_Product_8502.kl b/data/keyboards/Vendor_0a5c_Product_8502.kl
index f6dbfd4..2f07328 100644
--- a/data/keyboards/Vendor_0a5c_Product_8502.kl
+++ b/data/keyboards/Vendor_0a5c_Product_8502.kl
@@ -24,7 +24,7 @@ key 316 BUTTON_MODE
key 317 BUTTON_THUMBL
key 318 BUTTON_THUMBR
-key 158 BACK WAKE_DROPPED
+key 158 BACK
key 172 HOME
axis 0x00 X
diff --git a/data/keyboards/Vendor_18d1_Product_2c40.kl b/data/keyboards/Vendor_18d1_Product_2c40.kl
index 903f13b..6efde4f 100644
--- a/data/keyboards/Vendor_18d1_Product_2c40.kl
+++ b/data/keyboards/Vendor_18d1_Product_2c40.kl
@@ -24,7 +24,7 @@ key 316 BUTTON_MODE
key 317 BUTTON_THUMBL
key 318 BUTTON_THUMBR
-key 158 BACK WAKE_DROPPED
+key 158 BACK
key 172 HOME
axis 0x00 X
diff --git a/data/keyboards/qwerty.kl b/data/keyboards/qwerty.kl
index f1caacd..58bf654 100644
--- a/data/keyboards/qwerty.kl
+++ b/data/keyboards/qwerty.kl
@@ -30,29 +30,29 @@ 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 158 BACK
+key 230 SOFT_RIGHT
+key 60 SOFT_LEFT
+key 107 ENDCALL
+key 62 ENDCALL
+key 229 MENU
+key 139 MENU
+key 59 MENU
+key 127 SEARCH
+key 217 SEARCH
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 231 CALL
+key 61 CALL
+key 232 DPAD_CENTER
+key 108 DPAD_DOWN
+key 103 DPAD_UP
+key 102 HOME
+key 105 DPAD_LEFT
+key 106 DPAD_RIGHT
+key 115 VOLUME_UP
+key 114 VOLUME_DOWN
+key 116 POWER
key 212 CAMERA
key 16 Q
@@ -108,5 +108,5 @@ key 13 EQUALS
key 215 AT
# On an AT keyboard: ESC, F10
-key 1 BACK WAKE_DROPPED
-key 68 MENU WAKE_DROPPED
+key 1 BACK
+key 68 MENU