diff options
| author | Michael Wright <michaelwr@google.com> | 2014-08-22 18:02:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 18:02:27 +0000 |
| commit | 931b2e7c3a0133929f72e729e4ed8edf2b55c15e (patch) | |
| tree | df5cd42fe06dadfe23f8449f04a8bd02ed43d1d1 /core/java | |
| parent | eda777592b2fe6eb709c86a85e2df63745ef0829 (diff) | |
| parent | dc63f7b91c1632ca9e3f8725ae5ed43e7f7dcd8b (diff) | |
| download | frameworks_base-931b2e7c3a0133929f72e729e4ed8edf2b55c15e.zip frameworks_base-931b2e7c3a0133929f72e729e4ed8edf2b55c15e.tar.gz frameworks_base-931b2e7c3a0133929f72e729e4ed8edf2b55c15e.tar.bz2 | |
Merge "Add Voice Assist key." into lmp-dev
Diffstat (limited to 'core/java')
| -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 681717c..964b054 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -657,11 +657,15 @@ public class KeyEvent extends InputEvent implements Parcelable { /** Key code constant: TV data service key. * Displays data services like weather, sports. */ public static final int KEYCODE_TV_DATA_SERVICE = 230; + /** Key code constant: Voice Assist key. + * Launches the global voice assist activity. Not delivered to applications. */ + public static final int KEYCODE_VOICE_ASSIST = 231; - private static final int LAST_KEYCODE = KEYCODE_TV_DATA_SERVICE; + private static final int LAST_KEYCODE = KEYCODE_VOICE_ASSIST; // NOTE: If you add a new keycode here you must also add it to: // isSystem() + // isWakeKey() // frameworks/native/include/android/keycodes.h // frameworks/native/include/input/InputEventLabels.h // frameworks/base/core/res/res/values/attrs.xml |