diff options
| author | Michael Wright <michaelwr@google.com> | 2015-08-06 15:17:31 +0100 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2015-08-07 14:46:16 +0100 |
| commit | 62ec2dd563eb9f537d76e6bb9c13d630f5ab01dc (patch) | |
| tree | eaccdc8b852a860025fb854322f7a9eaefc4a15f | |
| parent | ea2afa460a2c2ee6c44406c1993e8bbacac838ba (diff) | |
| download | native-62ec2dd563eb9f537d76e6bb9c13d630f5ab01dc.tar.gz | |
DO NOT MERGE Add new media navigation keys.
Bug: 22059484
Change-Id: I587eb7622555194f18f403da583e3b70656a530e
| -rw-r--r-- | include/android/keycodes.h | 6 | ||||
| -rw-r--r-- | include/input/InputEventLabels.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/android/keycodes.h b/include/android/keycodes.h index 80e44c03ac..de9e7354b5 100644 --- a/include/android/keycodes.h +++ b/include/android/keycodes.h @@ -306,7 +306,11 @@ enum { AKEYCODE_NAVIGATE_PREVIOUS = 260, AKEYCODE_NAVIGATE_NEXT = 261, AKEYCODE_NAVIGATE_IN = 262, - AKEYCODE_NAVIGATE_OUT = 263 + AKEYCODE_NAVIGATE_OUT = 263, + 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. diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h index 3962001dd9..a7a93297f8 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(MEDIA_SKIP_FORWARD), + DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD), + DEFINE_KEYCODE(MEDIA_STEP_FORWARD), + DEFINE_KEYCODE(MEDIA_STEP_BACKWARD), { NULL, 0 } }; |