diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 02:11:06 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 02:11:06 +0100 |
commit | dcadad708abe4fc3b5dfe122618f3f8d3a19e614 (patch) | |
tree | 258a05e0d0a8b9b3f1bffba3974aa95cdfd1f61a /include/android/keycodes.h | |
parent | 932ec6cd7ae0fda0c186870c29c210a6afc8e692 (diff) | |
parent | 65a4c0c045185e8bf5ad54ef8db2a3dbbf6c2813 (diff) | |
download | frameworks_native-dcadad708abe4fc3b5dfe122618f3f8d3a19e614.zip frameworks_native-dcadad708abe4fc3b5dfe122618f3f8d3a19e614.tar.gz frameworks_native-dcadad708abe4fc3b5dfe122618f3f8d3a19e614.tar.bz2 |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_native into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'include/android/keycodes.h')
-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. |