diff options
| author | Anthony Hugh <ahugh@google.com> | 2015-06-23 10:49:05 -0700 |
|---|---|---|
| committer | Anthony Hugh <ahugh@google.com> | 2015-06-24 13:26:55 -0700 |
| commit | 887b00dd28627d635f06a1ffca27553f265b28e0 (patch) | |
| tree | 7e18608b12aefbbb79e536e5257e6f33459a5fa1 | |
| parent | 12b26278dfa582b77c657d1d2bdf75e9443d4062 (diff) | |
| download | frameworks_native-887b00dd28627d635f06a1ffca27553f265b28e0.zip frameworks_native-887b00dd28627d635f06a1ffca27553f265b28e0.tar.gz frameworks_native-887b00dd28627d635f06a1ffca27553f265b28e0.tar.bz2 | |
Introduce stem keycodes for Wear
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG: 21903503
Change-Id: I60f87f027fa4d4b19933d96b4110019805b30895
| -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 15bb786..f671116 100644 --- a/include/android/keycodes.h +++ b/include/android/keycodes.h @@ -722,7 +722,16 @@ enum { AKEYCODE_NAVIGATE_PREVIOUS = 260, AKEYCODE_NAVIGATE_NEXT = 261, AKEYCODE_NAVIGATE_IN = 262, - AKEYCODE_NAVIGATE_OUT = 263 + AKEYCODE_NAVIGATE_OUT = 263, + /** 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 3962001..a38de00 100644 --- a/include/input/InputEventLabels.h +++ b/include/input/InputEventLabels.h @@ -303,6 +303,10 @@ static const InputEventLabel KEYCODES[] = { DEFINE_KEYCODE(NAVIGATE_NEXT), DEFINE_KEYCODE(NAVIGATE_IN), DEFINE_KEYCODE(NAVIGATE_OUT), + DEFINE_KEYCODE(STEM_PRIMARY), + DEFINE_KEYCODE(STEM_1), + DEFINE_KEYCODE(STEM_2), + DEFINE_KEYCODE(STEM_3), { NULL, 0 } }; |