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

Commit b642fa96 authored by Nick Armstrong-Crews's avatar Nick Armstrong-Crews
Browse files

resolved conflicts for eba63c33 to master 

Change-Id: I9f7744f63adeb9961547487453f0526cdd99dbbd
parents 71b2947c eba63c33

include/android/keycodes.h

+3 −1
Original line number Diff line number Diff line
@@ -749,7 +749,9 @@ enum { 
    AKEYCODE_MEDIA_STEP_FORWARD = 274,

    /** Step backward media key.

     * Steps media backward one from at a time. */

    AKEYCODE_MEDIA_STEP_BACKWARD = 275

    AKEYCODE_MEDIA_STEP_BACKWARD = 275,

    /** Put device to sleep unless a wakelock is held. */

    AKEYCODE_SOFT_SLEEP = 276



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

include/input/InputEventLabels.h

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ static const InputEventLabel KEYCODES[] = { 
    DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD),

    DEFINE_KEYCODE(MEDIA_STEP_FORWARD),

    DEFINE_KEYCODE(MEDIA_STEP_BACKWARD),

    DEFINE_KEYCODE(SOFT_SLEEP),



    { NULL, 0 }

};