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

Commit d516bfc5 authored by Max Zhang's avatar Max Zhang Committed by Automerger Merge Worker
Browse files

Merge "[1/4] Add user customizable MACRO_x keys in frameworks" into udc-dev am: a2e66c94 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22118580



Change-Id: If4a8f752e686d0e9a406e880d25c557188e34cf3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d59bd2cd a2e66c94

include/android/keycodes.h

+8 −0
Original line number Diff line number Diff line
@@ -831,6 +831,14 @@ enum { 
    AKEYCODE_STYLUS_BUTTON_TAIL = 311,

    /** Key to open recent apps (a.k.a. Overview) */

    AKEYCODE_RECENT_APPS = 312,

    /** User customizable key #1. */

    AKEYCODE_MACRO_1 = 313,

    /** User customizable key #2. */

    AKEYCODE_MACRO_2 = 314,

    /** User customizable key #3. */

    AKEYCODE_MACRO_3 = 315,

    /** User customizable key #4. */

    AKEYCODE_MACRO_4 = 316,



    // 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

+5 −1
Original line number Diff line number Diff line
@@ -343,7 +343,11 @@ namespace android { 
    DEFINE_KEYCODE(STYLUS_BUTTON_SECONDARY), \

    DEFINE_KEYCODE(STYLUS_BUTTON_TERTIARY), \

    DEFINE_KEYCODE(STYLUS_BUTTON_TAIL), \

    DEFINE_KEYCODE(RECENT_APPS)

    DEFINE_KEYCODE(RECENT_APPS), \

    DEFINE_KEYCODE(MACRO_1), \

    DEFINE_KEYCODE(MACRO_2), \

    DEFINE_KEYCODE(MACRO_3), \

    DEFINE_KEYCODE(MACRO_4)



// 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.