diff options
| author | Anthony Hugh <ahugh@google.com> | 2015-06-25 01:27:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-25 01:27:44 +0000 |
| commit | 209ea40e8f3ccda405cd4e99c768b9b9b43e9dfa (patch) | |
| tree | 881c94eff9838f3bb821be99920a23a75249ab17 /include | |
| parent | d2fb7a6e49f04182ba7b639c340414b1745137f2 (diff) | |
| parent | 9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f (diff) | |
| download | frameworks_native-209ea40e8f3ccda405cd4e99c768b9b9b43e9dfa.zip frameworks_native-209ea40e8f3ccda405cd4e99c768b9b9b43e9dfa.tar.gz frameworks_native-209ea40e8f3ccda405cd4e99c768b9b9b43e9dfa.tar.bz2 | |
am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f':
DO NOT MERGE: Introduce stem keycodes for Wear
Diffstat (limited to 'include')
| -rw-r--r-- | include/android/keycodes.h | 11 | ||||
| -rw-r--r-- | include/input/InputEventLabels.h | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/android/keycodes.h b/include/android/keycodes.h index 75d0ab6..268d092 100644 --- a/include/android/keycodes.h +++ b/include/android/keycodes.h @@ -302,7 +302,16 @@ enum { AKEYCODE_TV_CONTENTS_MENU = 256, AKEYCODE_TV_MEDIA_CONTEXT_MENU = 257, AKEYCODE_TV_TIMER_PROGRAMMING = 258, - AKEYCODE_HELP = 259 + AKEYCODE_HELP = 259, + /** Primary stem key for Wear + * Main power/reset button on watch. */ + AKEYCODE_STEM_PRIMARY = 264, + /** Generic stem key 1 for Wear */ + AKEYCODE_STEM_1 = 265, + /** Generic stem key 2 for Wear */ + AKEYCODE_STEM_2 = 266, + /** Generic stem key 3 for Wear */ + AKEYCODE_STEM_3 = 267 // NOTE: If you add a new keycode here you must also add it to several other files. // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list. diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h index 9aa7425..8a339f7 100644 --- a/include/input/InputEventLabels.h +++ b/include/input/InputEventLabels.h @@ -299,6 +299,10 @@ static const InputEventLabel KEYCODES[] = { DEFINE_KEYCODE(TV_MEDIA_CONTEXT_MENU), DEFINE_KEYCODE(TV_TIMER_PROGRAMMING), DEFINE_KEYCODE(HELP), + DEFINE_KEYCODE(STEM_PRIMARY), + DEFINE_KEYCODE(STEM_1), + DEFINE_KEYCODE(STEM_2), + DEFINE_KEYCODE(STEM_3), { NULL, 0 } }; |