diff options
| author | Michael Wright <michaelwr@google.com> | 2015-09-22 21:04:33 +0100 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2015-09-22 22:05:48 +0100 |
| commit | a16b98c64f5246650aa5b6bc397a2d1fa6539107 (patch) | |
| tree | 7ed41fab2e4fd9cd50daae47f385700ca1ffc83e /include | |
| parent | d693fc4c50873485794d1e0f444547d3253a56d3 (diff) | |
| download | frameworks_native-a16b98c64f5246650aa5b6bc397a2d1fa6539107.zip frameworks_native-a16b98c64f5246650aa5b6bc397a2d1fa6539107.tar.gz frameworks_native-a16b98c64f5246650aa5b6bc397a2d1fa6539107.tar.bz2 | |
DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
This reverts commit 9b70ab7a3cb260205e81e40ba181a86710d2eb95, reversing
changes made to 153008efb5a00ed3c18d588ce15f90d2442a9786.
Bug: 24302031
Change-Id: Ia746381b30be3b54cb646ed412b7271962c4b02a
Diffstat (limited to 'include')
| -rw-r--r-- | include/android/keycodes.h | 15 | ||||
| -rw-r--r-- | include/input/InputEventLabels.h | 8 |
2 files changed, 1 insertions, 22 deletions
diff --git a/include/android/keycodes.h b/include/android/keycodes.h index 1f55d9f..15bb786 100644 --- a/include/android/keycodes.h +++ b/include/android/keycodes.h @@ -722,20 +722,7 @@ enum { AKEYCODE_NAVIGATE_PREVIOUS = 260, AKEYCODE_NAVIGATE_NEXT = 261, AKEYCODE_NAVIGATE_IN = 262, - 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 + AKEYCODE_NAVIGATE_OUT = 263 // 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 344f2f3..3962001 100644 --- a/include/input/InputEventLabels.h +++ b/include/input/InputEventLabels.h @@ -303,14 +303,6 @@ static const InputEventLabel KEYCODES[] = { DEFINE_KEYCODE(NAVIGATE_NEXT), DEFINE_KEYCODE(NAVIGATE_IN), DEFINE_KEYCODE(NAVIGATE_OUT), - DEFINE_KEYCODE(STEM_PRIMARY), - 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 } }; |