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

Merge commit '62ec2dd5' into mm

Browse Source 
Change-Id: I34801df36735545fc500486209573ed2864a0430
This commit is contained in:
Michael Wright 2015-08-07 18:12:20 +01:00
commit 1362ec74fc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/android/keycodes.h
View File

@ -731,7 +731,11 @@ enum {
/** Generic stem key 2 for Wear */ /** Generic stem key 2 for Wear */
AKEYCODE_STEM_2 = 266, AKEYCODE_STEM_2 = 266,
/** Generic stem key 3 for Wear */ /** Generic stem key 3 for Wear */
AKEYCODE_STEM_3 = 267 AKEYCODE_STEM_3 = 267,
AKEYCODE_MEDIA_SKIP_FORWARD = 272,
AKEYCODE_MEDIA_SKIP_BACKWARD = 273,
AKEYCODE_MEDIA_STEP_FORWARD = 274,
AKEYCODE_MEDIA_STEP_BACKWARD = 275
// 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

@ -307,6 +307,10 @@ static const InputEventLabel KEYCODES[] = {
DEFINE_KEYCODE(STEM_1), DEFINE_KEYCODE(STEM_1),
DEFINE_KEYCODE(STEM_2), DEFINE_KEYCODE(STEM_2),
DEFINE_KEYCODE(STEM_3), DEFINE_KEYCODE(STEM_3),
DEFINE_KEYCODE(MEDIA_SKIP_FORWARD),
DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD),
DEFINE_KEYCODE(MEDIA_STEP_FORWARD),
DEFINE_KEYCODE(MEDIA_STEP_BACKWARD),
{ NULL, 0 } { NULL, 0 }
}; };