diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-05 15:57:42 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-05 15:57:42 -0700 |
| commit | f78964490d8098387d51444c87bf520ad3f674e2 (patch) | |
| tree | 7384d69f165ea9a1d1a004a54b05155d29f1249e /include/ui | |
| parent | fc12b5be2ee49ba2392274d413bd5d759c03c346 (diff) | |
| parent | 1e936da287e1836502bf91b53468076726b7e1ee (diff) | |
| download | frameworks_base-f78964490d8098387d51444c87bf520ad3f674e2.zip frameworks_base-f78964490d8098387d51444c87bf520ad3f674e2.tar.gz frameworks_base-f78964490d8098387d51444c87bf520ad3f674e2.tar.bz2 | |
merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
Diffstat (limited to 'include/ui')
| -rwxr-xr-x[-rw-r--r--] | include/ui/KeycodeLabels.h | 6 |
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[] = { |