From 9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f Mon Sep 17 00:00:00 2001 From: Anthony Hugh Date: Tue, 23 Jun 2015 10:49:05 -0700 Subject: [PATCH] DO NOT MERGE: Introduce stem keycodes for Wear Cherry-pick from master 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: I762b8c0bcf3780a1756f4c1b8bbf07a039ba7781 --- include/android/keycodes.h | 11 ++++++++++- include/input/InputEventLabels.h | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/android/keycodes.h b/include/android/keycodes.h index 75d0ab69e..268d09291 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 9aa742587..8a339f7e1 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 } };