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 /core/java/android/view | |
| 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 'core/java/android/view')
| -rwxr-xr-x[-rw-r--r--] | core/java/android/view/KeyEvent.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 14e0159..9aa16b5 100644..100755 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -122,6 +122,8 @@ public class KeyEvent implements Parcelable { public static final int KEYCODE_MUTE = 91; public static final int KEYCODE_PAGE_UP = 92; public static final int KEYCODE_PAGE_DOWN = 93; + public static final int KEYCODE_PICTSYMBOLS = 94; // switch symbol-sets (Emoji,Kao-moji) + public static final int KEYCODE_SWITCH_CHARSET = 95; // switch char-sets (Kanji,Katakana) // NOTE: If you add a new keycode here you must also add it to: // isSystem() @@ -137,7 +139,7 @@ public class KeyEvent implements Parcelable { // those new codes. This is intended to maintain a consistent // set of key code definitions across all Android devices. - private static final int LAST_KEYCODE = KEYCODE_PAGE_DOWN; + private static final int LAST_KEYCODE = KEYCODE_SWITCH_CHARSET; /** * @deprecated There are now more than MAX_KEYCODE keycodes. @@ -694,6 +696,8 @@ public class KeyEvent implements Parcelable { case KEYCODE_CAMERA: case KEYCODE_FOCUS: case KEYCODE_SEARCH: + case KEYCODE_PICTSYMBOLS: + case KEYCODE_SWITCH_CHARSET: return true; default: return false; |