diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:17:45 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:17:45 -0800 |
| commit | a98331d1ae08eb57a4829674ce05f50de80c169c (patch) | |
| tree | f6ff1a51d6e1b773781f6d71ddfd564f0a26237e /include/android | |
| parent | efd11d3c0bd9dab4f83398acab27226b73da774f (diff) | |
| parent | 6df23e81f762ec7bdf3d575582ad51aaef5172cf (diff) | |
| download | frameworks_native-a98331d1ae08eb57a4829674ce05f50de80c169c.zip frameworks_native-a98331d1ae08eb57a4829674ce05f50de80c169c.tar.gz frameworks_native-a98331d1ae08eb57a4829674ce05f50de80c169c.tar.bz2 | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/native into cm-13.0
Android 6.0.1 release 22
Diffstat (limited to 'include/android')
| -rw-r--r-- | include/android/keycodes.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/android/keycodes.h b/include/android/keycodes.h index 15bb786..421abe5 100644 --- a/include/android/keycodes.h +++ b/include/android/keycodes.h @@ -722,7 +722,22 @@ enum { AKEYCODE_NAVIGATE_PREVIOUS = 260, AKEYCODE_NAVIGATE_NEXT = 261, AKEYCODE_NAVIGATE_IN = 262, - AKEYCODE_NAVIGATE_OUT = 263 + AKEYCODE_NAVIGATE_OUT = 263, + /** 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, + AKEYCODE_MEDIA_SKIP_FORWARD = 272, + AKEYCODE_MEDIA_SKIP_BACKWARD = 273, + AKEYCODE_MEDIA_STEP_FORWARD = 274, + AKEYCODE_MEDIA_STEP_BACKWARD = 275, + /** Put device to sleep unless a wakelock is held. */ + AKEYCODE_SOFT_SLEEP = 276 // 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. |