diff options
| author | Michael Wright <michaelwr@google.com> | 2015-08-07 18:00:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 18:00:55 +0000 |
| commit | 18108fd6837fffff1b7c1db418d44bc7644911f1 (patch) | |
| tree | c1813fd3ba3a83e4120fb8f4e86f8d1aea7ed5de | |
| parent | 04eeb2882567412cdcec5981b50c9e7c024b03cc (diff) | |
| parent | 1362ec74fc4f1dc223c9c322f8f49c966ba67594 (diff) | |
| download | frameworks_native-18108fd6837fffff1b7c1db418d44bc7644911f1.zip frameworks_native-18108fd6837fffff1b7c1db418d44bc7644911f1.tar.gz frameworks_native-18108fd6837fffff1b7c1db418d44bc7644911f1.tar.bz2 | |
am 1362ec74: Merge commit \'62ec2dd5\' into mm
* commit '1362ec74fc4f1dc223c9c322f8f49c966ba67594':
DO NOT MERGE Add new media navigation keys.
| -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 f671116..1f55d9f 100644 --- a/include/android/keycodes.h +++ b/include/android/keycodes.h @@ -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. diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h index a38de00..344f2f3 100644 --- a/include/input/InputEventLabels.h +++ b/include/input/InputEventLabels.h @@ -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 } }; |