diff options
| author | Chenjie Luo <cjluo@google.com> | 2016-01-14 02:24:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 02:24:48 +0000 |
| commit | d5cea64d8d63e9ffb61af1e669962de08ea513cc (patch) | |
| tree | 69b968c682ced443a67f9d2c7fbf511bbcdc8eb6 /core | |
| parent | d2e215978be9df2f3d2bf56eb1c857c6a1bc420a (diff) | |
| parent | 4a577bff9674f4bc748ab76bf48ac6e7d3e567cc (diff) | |
| download | frameworks_base-d5cea64d8d63e9ffb61af1e669962de08ea513cc.zip frameworks_base-d5cea64d8d63e9ffb61af1e669962de08ea513cc.tar.gz frameworks_base-d5cea64d8d63e9ffb61af1e669962de08ea513cc.tar.bz2 | |
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
am: 4a577bff96
* commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 3 |
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; |