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 | 30f71ce5971b5a129e134b7a1fb8c2e53a50f23f (patch) | |
| tree | 40d6996de15cbcb1c922b87f867cfac75f40dc31 /include | |
| parent | 96bbb9e97844e622f8733c2aefc4869015eaac95 (diff) | |
| parent | 031dd9e254209833f903b0c168a088b7ae5dc05a (diff) | |
| download | frameworks_native-30f71ce5971b5a129e134b7a1fb8c2e53a50f23f.zip frameworks_native-30f71ce5971b5a129e134b7a1fb8c2e53a50f23f.tar.gz frameworks_native-30f71ce5971b5a129e134b7a1fb8c2e53a50f23f.tar.bz2 | |
merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
Diffstat (limited to 'include')
| -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[] = { |