diff options
| author | 2017-09-07 02:00:12 +0000 | |
|---|---|---|
| committer | 2017-09-07 02:00:12 +0000 | |
| commit | 047fcbf6711e5f2f7a6c2444f4982b48aae91ae1 (patch) | |
| tree | 59437ac76c62f65cc2153ad294b5c85564bf87e8 | |
| parent | cefb8a6742b0079748db254011a220128180a818 (diff) | |
| parent | 6afce442eadb3b26d582815e7e14c93e3f487068 (diff) | |
Merge "Add a new keycode for TV (ALL_APPS)" into oc-dev
am: 6afce442ea
Change-Id: I7933009ee4c64025245373ee6b5ad1b0d77291e9
| -rw-r--r-- | include/android/keycodes.h | 4 | ||||
| -rw-r--r-- | include/input/InputEventLabels.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/android/keycodes.h b/include/android/keycodes.h index e202060f16..2164d6163e 100644 --- a/include/android/keycodes.h +++ b/include/android/keycodes.h @@ -765,7 +765,9 @@ enum { /** fingerprint navigation key, left. */ AKEYCODE_SYSTEM_NAVIGATION_LEFT = 282, /** fingerprint navigation key, right. */ - AKEYCODE_SYSTEM_NAVIGATION_RIGHT = 283 + AKEYCODE_SYSTEM_NAVIGATION_RIGHT = 283, + /** all apps */ + AKEYCODE_ALL_APPS = 284 // 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 20154eb10e..c282cf0b22 100644 --- a/include/input/InputEventLabels.h +++ b/include/input/InputEventLabels.h @@ -323,6 +323,7 @@ static const InputEventLabel KEYCODES[] = { DEFINE_KEYCODE(SYSTEM_NAVIGATION_DOWN), DEFINE_KEYCODE(SYSTEM_NAVIGATION_LEFT), DEFINE_KEYCODE(SYSTEM_NAVIGATION_RIGHT), + DEFINE_KEYCODE(ALL_APPS), { NULL, 0 } }; |