summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-05-05 13:49:58 -0700
committerAndroid Code Review <code-review@android.com>2010-05-05 13:49:58 -0700
commit1e936da287e1836502bf91b53468076726b7e1ee (patch)
treeba88d03eabc5379766114d8fde330c8f758db0d7 /include
parent0938ef4215869c36575684b9949e82e547dbb65c (diff)
parentb032bc037399110f41cfdb838a792b3c65756323 (diff)
downloadframeworks_base-1e936da287e1836502bf91b53468076726b7e1ee.zip
frameworks_base-1e936da287e1836502bf91b53468076726b7e1ee.tar.gz
frameworks_base-1e936da287e1836502bf91b53468076726b7e1ee.tar.bz2
Merge "Add new keycodes for the convenience of Japanese IMEs"
Diffstat (limited to 'include')
-rwxr-xr-x[-rw-r--r--]include/ui/KeycodeLabels.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/ui/KeycodeLabels.h b/include/ui/KeycodeLabels.h
index 749155e..e81d0f9 100644..100755
--- a/include/ui/KeycodeLabels.h
+++ b/include/ui/KeycodeLabels.h
@@ -116,6 +116,8 @@ static const KeycodeLabel KEYCODES[] = {
{ "MUTE", 91 },
{ "PAGE_UP", 92 },
{ "PAGE_DOWN", 93 },
+ { "PICTSYMBOLS", 94 },
+ { "SWITCH_CHARSET", 95 },
// NOTE: If you add a new keycode here you must also add it to:
// (enum KeyCode, in this file)
@@ -222,7 +224,9 @@ typedef enum KeyCode {
kKeyCodeForward = 90,
kKeyCodeMute = 91,
kKeyCodePageUp = 92,
- kKeyCodePageDown = 93
+ kKeyCodePageDown = 93,
+ kKeyCodePictSymbols = 94,
+ kKeyCodeSwitchCharset = 95
} KeyCode;
static const KeycodeLabel FLAGS[] = {