summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vaibhav Devmurari <vdevmurari@google.com> 2024-01-24 21:41:12 +0000
committer Vaibhav Devmurari <vdevmurari@google.com> 2024-01-30 12:17:54 +0000
commitf14b37a878bdefe924db5e99dd124f0ea8e5ffa2 (patch)
treef9d839d080dc51712ba9a56ce986dcec9e67c2a5
parent1b685dd3b6373ba55be1c57c672a22533e16664d (diff)
Add native side keycodes for emoji and screenshot
Bug: 315307777 Test: manual Change-Id: I737a7418f43afac4735bb1a5523713890f4df553
-rw-r--r--include/android/keycodes.h4
-rw-r--r--libs/input/InputEventLabels.cpp4
2 files changed, 7 insertions, 1 deletions
diff --git a/include/android/keycodes.h b/include/android/keycodes.h
index f8fb256fae..79cdbcaf7b 100644
--- a/include/android/keycodes.h
+++ b/include/android/keycodes.h
@@ -839,6 +839,10 @@ enum {
AKEYCODE_MACRO_3 = 315,
/** User customizable key #4. */
AKEYCODE_MACRO_4 = 316,
+ /** Open Emoji picker */
+ AKEYCODE_EMOJI_PICKER = 317,
+ /** Take Screenshot */
+ AKEYCODE_SCREENSHOT = 318,
// 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/libs/input/InputEventLabels.cpp b/libs/input/InputEventLabels.cpp
index 0e627e56fd..8db0ca588b 100644
--- a/libs/input/InputEventLabels.cpp
+++ b/libs/input/InputEventLabels.cpp
@@ -348,7 +348,9 @@ namespace android {
DEFINE_KEYCODE(MACRO_1), \
DEFINE_KEYCODE(MACRO_2), \
DEFINE_KEYCODE(MACRO_3), \
- DEFINE_KEYCODE(MACRO_4)
+ DEFINE_KEYCODE(MACRO_4), \
+ DEFINE_KEYCODE(EMOJI_PICKER), \
+ DEFINE_KEYCODE(SCREENSHOT)
// NOTE: If you add a new axis here you must also add it to several other files.
// Refer to frameworks/base/core/java/android/view/MotionEvent.java for the full list.