commit ab1f0724b0f8291547713985bd63dc83c6bb7881
author Peng Xu <pengxu@google.com> Sat Sep 23 01:32:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 23 01:32:06 2017 +0000
tree dc62afc976df4b5e51e5a81e0aa16e4d07fa06c0
parent 9ef13167c929cea8ccf610d6c388b1a90e693d77
parent 3cd9b00a9a7c0958f833a6aac768511558d4d0c4

resolve merge conflicts of 4f33ab9ef to stage-aosp-master
am: 3cd9b00a9a

Change-Id: I06300dc4961d0149cfa869fa4eb9340b21e8ab82

include/android/keycodes.h

diff --git a/include/android/keycodes.h b/include/android/keycodes.h
index e202060..2164d61 100644
--- a/include/android/keycodes.h
+++ b/include/android/keycodes.h
@@ -765,7 +765,9 @@
     /** 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.

include/input/InputEventLabels.h

diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h
index 20154eb..c282cf0 100644
--- a/include/input/InputEventLabels.h
+++ b/include/input/InputEventLabels.h
@@ -323,6 +323,7 @@
     DEFINE_KEYCODE(SYSTEM_NAVIGATION_DOWN),
     DEFINE_KEYCODE(SYSTEM_NAVIGATION_LEFT),
     DEFINE_KEYCODE(SYSTEM_NAVIGATION_RIGHT),
+    DEFINE_KEYCODE(ALL_APPS),
 
     { NULL, 0 }
 };