summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChenjie Luo <cjluo@google.com>2016-01-14 02:22:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-01-14 02:22:15 +0000
commit4a577bff9674f4bc748ab76bf48ac6e7d3e567cc (patch)
treef02fdf8efb4a556cfdd50aa523c4f1ca52e384dd
parent74dfcf90f18d8d0e1128707a5986c4fa94d70350 (diff)
parentbad498f7fd4e3d9ddb9f4d995ab6110b4aa36171 (diff)
downloadframeworks_base-4a577bff9674f4bc748ab76bf48ac6e7d3e567cc.zip
frameworks_base-4a577bff9674f4bc748ab76bf48ac6e7d3e567cc.tar.gz
frameworks_base-4a577bff9674f4bc748ab76bf48ac6e7d3e567cc.tar.bz2
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
-rw-r--r--core/java/android/view/KeyEvent.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index 052ef7c..19d5c73 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -1846,6 +1846,9 @@ public class KeyEvent extends InputEvent implements Parcelable {
case KeyEvent.KEYCODE_MENU:
case KeyEvent.KEYCODE_WAKEUP:
case KeyEvent.KEYCODE_PAIRING:
+ case KeyEvent.KEYCODE_STEM_1:
+ case KeyEvent.KEYCODE_STEM_2:
+ case KeyEvent.KEYCODE_STEM_3:
return true;
}
return false;