diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-06-13 18:28:57 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-06-14 04:16:26 -0700 |
| commit | de7a8ead2467a4a152a5a9b2416c8048f1b48bbb (patch) | |
| tree | 5ab60322af4c99c1c24eb96f44883a77a867d843 /core/java/android/view/KeyEvent.java | |
| parent | 82134f76936be049cc4b23a894ba7decc1d59952 (diff) | |
Add new ASSIST key and map it to the global assist intent.
Moved some duplicate code from SearchPanelView and LockScreen
over to SearchManager to avoid creating yet another copy of it
in PhoneWindowManager.
Bug: 6594275
Change-Id: Ib4ebcd6817639d17548952ab2ce7cb876c05777c
Diffstat (limited to 'core/java/android/view/KeyEvent.java')
| -rwxr-xr-x | 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 1080229da822..c2a3e5816ea3 100755 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -620,8 +620,11 @@ public class KeyEvent extends InputEvent implements Parcelable { public static final int KEYCODE_RO = 217; /** Key code constant: Japanese kana key. */ public static final int KEYCODE_KANA = 218; + /** Key code constant: Assist key. + * Launches the global assist activity. Not delivered to applications. */ + public static final int KEYCODE_ASSIST = 219; - private static final int LAST_KEYCODE = KEYCODE_KANA; + private static final int LAST_KEYCODE = KEYCODE_ASSIST; // NOTE: If you add a new keycode here you must also add it to: // isSystem() @@ -862,6 +865,7 @@ public class KeyEvent extends InputEvent implements Parcelable { names.append(KEYCODE_YEN, "KEYCODE_YEN"); names.append(KEYCODE_RO, "KEYCODE_RO"); names.append(KEYCODE_KANA, "KEYCODE_KANA"); + names.append(KEYCODE_ASSIST, "KEYCODE_ASSIST"); }; // Symbolic names of all metakeys in bit order from least significant to most significant. |