am 18108fd6: am 1362ec74: Merge commit \'62ec2dd5\' into mm
* commit '18108fd6837fffff1b7c1db418d44bc7644911f1': DO NOT MERGE Add new media navigation keys.
This commit is contained in:
commit
e14f71efd4
|
@ -731,7 +731,11 @@ enum {
|
|||
/** Generic stem key 2 for Wear */
|
||||
AKEYCODE_STEM_2 = 266,
|
||||
/** 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.
|
||||
// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.
|
||||
|
|
|
@ -307,6 +307,10 @@ static const InputEventLabel KEYCODES[] = {
|
|||
DEFINE_KEYCODE(STEM_1),
|
||||
DEFINE_KEYCODE(STEM_2),
|
||||
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 }
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue