diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-07 17:14:38 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-07 17:14:38 +0000 |
| commit | 6fd7e0afbdbeca2cdf960fc79273a7c493241588 (patch) | |
| tree | eae45d330f4011ddcad176e0dbb33b816035a326 | |
| parent | 7d951867416234a6f3228eb9d888009184b1d0b7 (diff) | |
| parent | d88839df25bf663cdc2bc10dcb9037b900be8cc6 (diff) | |
| download | native-oreo-r2-release.tar.gz | |
Merge cherrypicks of [2860986, 2860116, 2860927, 2860463, 2861006, 2861007, 2860788, 2860789, 2860790, 2860791, 2860970, 2860792, 2861008, 2860117, 2860971] into oc-r2-releaseandroid-8.0.0_r29oreo-r2-release
Change-Id: Ic50e7e567000bdb2d9d1b83df00ab3ba40fa7dc2
| -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 } }; |