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

Commit 97e77627 authored by Michael Wright's avatar Michael Wright
Browse files

Merge commit '9dd2663d' into mm 

Change-Id: Idf37dbc3bba970817e6620fe0129e54e86f553d5
parents 1f514608 9dd2663d

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -35140,6 +35140,10 @@ package android.view { 
    field public static final int KEYCODE_MEDIA_PREVIOUS = 88; // 0x58

    field public static final int KEYCODE_MEDIA_RECORD = 130; // 0x82

    field public static final int KEYCODE_MEDIA_REWIND = 89; // 0x59

    field public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273; // 0x111

    field public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272; // 0x110

    field public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; // 0x113

    field public static final int KEYCODE_MEDIA_STEP_FORWARD = 274; // 0x112

    field public static final int KEYCODE_MEDIA_STOP = 86; // 0x56

    field public static final int KEYCODE_MEDIA_TOP_MENU = 226; // 0xe2

    field public static final int KEYCODE_MENU = 82; // 0x52

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -37432,6 +37432,10 @@ package android.view { 
    field public static final int KEYCODE_MEDIA_PREVIOUS = 88; // 0x58

    field public static final int KEYCODE_MEDIA_RECORD = 130; // 0x82

    field public static final int KEYCODE_MEDIA_REWIND = 89; // 0x59

    field public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273; // 0x111

    field public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272; // 0x110

    field public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; // 0x113

    field public static final int KEYCODE_MEDIA_STEP_FORWARD = 274; // 0x112

    field public static final int KEYCODE_MEDIA_STOP = 86; // 0x56

    field public static final int KEYCODE_MEDIA_TOP_MENU = 226; // 0xe2

    field public static final int KEYCODE_MENU = 82; // 0x52

core/java/android/view/KeyEvent.java

+16 −6
Original line number Diff line number Diff line
@@ -774,8 +774,18 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    /** Key code constant: Generic stem key 3 for Wear

     * @hide */

    public static final int KEYCODE_STEM_3 = 267;



    private static final int LAST_KEYCODE = KEYCODE_STEM_3;

    /** Key code constant: Skip forward media key. */

    public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272;

    /** Key code constant: Skip backward media key. */

    public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273;

    /** Key code constant: Step forward media key.

     * Steps media forward, one frame at a time. */

    public static final int KEYCODE_MEDIA_STEP_FORWARD = 274;

    /** Key code constant: Step backward media key.

     * Steps media backward, one frame at a time. */

    public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275;



    private static final int LAST_KEYCODE = KEYCODE_MEDIA_STEP_BACKWARD;



    // NOTE: If you add a new keycode here you must also add it to:

    //  isSystem()

core/res/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -1810,6 +1810,10 @@ i 
        <enum name="KEYCODE_STEM_1" value="265" />

        <enum name="KEYCODE_STEM_2" value="266" />

        <enum name="KEYCODE_STEM_3" value="267" />

        <enum name="KEYCODE_MEDIA_SKIP_FORWARD" value="272" />

        <enum name="KEYCODE_MEDIA_SKIP_BACKWARD" value="273" />

        <enum name="KEYCODE_MEDIA_STEP_FORWARD" value="274" />

        <enum name="KEYCODE_MEDIA_STEP_BACKWARD" value="275" />

    </attr>



    <!-- ***************************************************************** -->