diff options
| author | Chenjie Luo <cjluo@google.com> | 2016-01-14 06:13:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 06:13:43 +0000 |
| commit | 5ffb219d80dec6945bcf3add12d49e40623270f9 (patch) | |
| tree | c7663af276db13cdaa6fea7816aea0ed981d0b35 /core/java/android/view/KeyEvent.java | |
| parent | 9297a0fb2abcf3dbeeb9a39318b4b7cf5a328f87 (diff) | |
| parent | af8c1b8f943f2c616c75da83b44063ae3a5f556f (diff) | |
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d am: 7034a6e2d0
am: af8c1b8f94
* commit 'af8c1b8f943f2c616c75da83b44063ae3a5f556f':
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Diffstat (limited to 'core/java/android/view/KeyEvent.java')
| -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 f037958f5cfc..51e1f4baae97 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -1856,6 +1856,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; |