diff options
| author | 2024-05-24 08:27:45 -0700 | |
|---|---|---|
| committer | 2024-05-24 08:27:45 -0700 | |
| commit | 5968781840bb5bead4758c9adb1e41bbea1c24c7 (patch) | |
| tree | d0c6e21063ef3a2265bd3071e363ddfe9ccf618b /libs/input/InputEventLabels.cpp | |
| parent | a99e1cd67b5d2237200bf23b44a03e0eb31e9326 (diff) | |
| parent | 8bf4487ae52ce8d1797ea58dd0b1109255518ceb (diff) | |
Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I8d975b81afd2cde1d543e8bc7e730a6e42393bec
Change-Id: I714982d2b0df34afc9f9729deb2636de5d0c7b64
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. |