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

Commit e14f71ef authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

am 18108fd6: am 1362ec74: Merge commit \'62ec2dd5\' into mm 

* commit '18108fd6':
  DO NOT MERGE Add new media navigation keys.
parents 2121b937 18108fd6

include/android/keycodes.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -731,7 +731,11 @@ enum { 
    /** Generic stem key 2 for Wear */

    /** Generic stem key 2 for Wear */

    AKEYCODE_STEM_2 = 266,

    AKEYCODE_STEM_2 = 266,

    /** Generic stem key 3 for Wear */

    /** Generic stem key 3 for Wear */

    AKEYCODE_STEM_3 = 267

    AKEYCODE_STEM_3 = 267,

    AKEYCODE_MEDIA_SKIP_FORWARD = 272,

    AKEYCODE_MEDIA_SKIP_BACKWARD = 273,

    AKEYCODE_MEDIA_STEP_FORWARD = 274,

    AKEYCODE_MEDIA_STEP_BACKWARD = 275





    // NOTE: If you add a new keycode here you must also add it to several other files.

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

    //       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

include/input/InputEventLabels.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -307,6 +307,10 @@ static const InputEventLabel KEYCODES[] = { 
    DEFINE_KEYCODE(STEM_1),

    DEFINE_KEYCODE(STEM_1),

    DEFINE_KEYCODE(STEM_2),

    DEFINE_KEYCODE(STEM_2),

    DEFINE_KEYCODE(STEM_3),

    DEFINE_KEYCODE(STEM_3),

    DEFINE_KEYCODE(MEDIA_SKIP_FORWARD),

    DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD),

    DEFINE_KEYCODE(MEDIA_STEP_FORWARD),

    DEFINE_KEYCODE(MEDIA_STEP_BACKWARD),





    { NULL, 0 }

    { NULL, 0 }

};

};