ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear

Browse Source 
* commit '9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f':
  DO NOT MERGE: Introduce stem keycodes for Wear
This commit is contained in:
Anthony Hugh 2015-06-25 01:27:44 +00:00 committed by Android Git Automerger
commit 209ea40e8f
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/android/keycodes.h
View File

@ -302,7 +302,16 @@ enum {
AKEYCODE_TV_CONTENTS_MENU = 256, AKEYCODE_TV_CONTENTS_MENU = 256,
AKEYCODE_TV_MEDIA_CONTEXT_MENU = 257, AKEYCODE_TV_MEDIA_CONTEXT_MENU = 257,
AKEYCODE_TV_TIMER_PROGRAMMING = 258, 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. // 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. // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

4
include/input/InputEventLabels.h
View File

@ -299,6 +299,10 @@ static const InputEventLabel KEYCODES[] = {
DEFINE_KEYCODE(TV_MEDIA_CONTEXT_MENU), DEFINE_KEYCODE(TV_MEDIA_CONTEXT_MENU),
DEFINE_KEYCODE(TV_TIMER_PROGRAMMING), DEFINE_KEYCODE(TV_TIMER_PROGRAMMING),
DEFINE_KEYCODE(HELP), DEFINE_KEYCODE(HELP),
DEFINE_KEYCODE(STEM_PRIMARY),
DEFINE_KEYCODE(STEM_1),
DEFINE_KEYCODE(STEM_2),
DEFINE_KEYCODE(STEM_3),
{ NULL, 0 } { NULL, 0 }
}; };