Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 169d22e5 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Add native side keycodes for emoji and screenshot" into main

parents b4856166 f14b37a8

include/android/keycodes.h

+4 −0
Original line number Diff line number Diff line
@@ -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.

libs/input/InputEventLabels.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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.