diff options
| author | 2024-06-17 18:51:25 +0000 | |
|---|---|---|
| committer | 2024-06-17 18:51:25 +0000 | |
| commit | 579f0c2a2ee68484fa59cf51ea974b5cd0d0a931 (patch) | |
| tree | 61954eed45f3e97ac0fbc30849f3cdc4e7d34a58 /libs/input/InputEventLabels.cpp | |
| parent | 1a75b0fd4896fb82f014940a65b0e97c6f7cd21c (diff) | |
| parent | fd63570c39c1c327fe015148467401dfb351a965 (diff) | |
Merge "Merge Android 14 QPR3 to AOSP main" into main
Diffstat (limited to 'libs/input/InputEventLabels.cpp')
| -rw-r--r-- | libs/input/InputEventLabels.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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. |