summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2014-08-21 19:05:21 -0700
committerMichael Wright <michaelwr@google.com>2014-08-21 19:05:21 -0700
commitdc63f7b91c1632ca9e3f8725ae5ed43e7f7dcd8b (patch)
tree6b5ddf81ed6f71b65023206a337b4412fe8bda89 /core/java
parent75f9918760ca3eb6cf753737fb34fb57146a5e59 (diff)
downloadframeworks_base-dc63f7b91c1632ca9e3f8725ae5ed43e7f7dcd8b.zip
frameworks_base-dc63f7b91c1632ca9e3f8725ae5ed43e7f7dcd8b.tar.gz
frameworks_base-dc63f7b91c1632ca9e3f8725ae5ed43e7f7dcd8b.tar.bz2
Add Voice Assist key.
The action taken is dependent on whether the device is in an interactive state, allowing for interactions to work even when the device isn't actively being used Bug: 16292420 Change-Id: I897f4383e7e4766c0bcb6246b41514b46e03a9ac
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/KeyEvent.java6
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