diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-05 16:00:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-05 16:00:01 -0700 |
| commit | 579e08e657a8dc9274b297b5dda95a4383cc3642 (patch) | |
| tree | 0b1113f2c57867bd95b7cba17a315363845b389a /include/ui | |
| parent | 33232d26bb51bf015fdf7dbd7a34c2b67745d72a (diff) | |
| parent | f78964490d8098387d51444c87bf520ad3f674e2 (diff) | |
| download | frameworks_base-579e08e657a8dc9274b297b5dda95a4383cc3642.zip frameworks_base-579e08e657a8dc9274b297b5dda95a4383cc3642.tar.gz frameworks_base-579e08e657a8dc9274b297b5dda95a4383cc3642.tar.bz2 | |
am f7896449: merge from open-source master
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken
* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
Add new keycodes for the convenience of Japanese IMEs
Call register_localized_collators() with the current locale.
Fixed deserialization problem in DatePicker.
Fix for bug 2467152 files with spaces fail to open.
Set alpha value for newly created dim surface.
telephony: Fix CID when CID is unknown
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[] = { |