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

Commit 456c7a76 authored by David Stevens's avatar David Stevens Committed by Android (Google) Code Review
Browse files

Merge "Add keycodes for diagonal dpad inputs"

parents ff7913d4 a487f0cb

api/current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -35102,9 +35102,13 @@ package android.view { 
    field public static final int KEYCODE_DEL = 67; // 0x43

    field public static final int KEYCODE_DEL = 67; // 0x43

    field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17

    field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17

    field public static final int KEYCODE_DPAD_DOWN = 20; // 0x14

    field public static final int KEYCODE_DPAD_DOWN = 20; // 0x14

    field public static final int KEYCODE_DPAD_DOWN_LEFT = 269; // 0x10d

    field public static final int KEYCODE_DPAD_DOWN_RIGHT = 271; // 0x10f

    field public static final int KEYCODE_DPAD_LEFT = 21; // 0x15

    field public static final int KEYCODE_DPAD_LEFT = 21; // 0x15

    field public static final int KEYCODE_DPAD_RIGHT = 22; // 0x16

    field public static final int KEYCODE_DPAD_RIGHT = 22; // 0x16

    field public static final int KEYCODE_DPAD_UP = 19; // 0x13

    field public static final int KEYCODE_DPAD_UP = 19; // 0x13

    field public static final int KEYCODE_DPAD_UP_LEFT = 268; // 0x10c

    field public static final int KEYCODE_DPAD_UP_RIGHT = 270; // 0x10e

    field public static final int KEYCODE_DVR = 173; // 0xad

    field public static final int KEYCODE_DVR = 173; // 0xad

    field public static final int KEYCODE_E = 33; // 0x21

    field public static final int KEYCODE_E = 33; // 0x21

    field public static final int KEYCODE_EISU = 212; // 0xd4

    field public static final int KEYCODE_EISU = 212; // 0xd4

api/system-current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -37413,9 +37413,13 @@ package android.view { 
    field public static final int KEYCODE_DEL = 67; // 0x43

    field public static final int KEYCODE_DEL = 67; // 0x43

    field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17

    field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17

    field public static final int KEYCODE_DPAD_DOWN = 20; // 0x14

    field public static final int KEYCODE_DPAD_DOWN = 20; // 0x14

    field public static final int KEYCODE_DPAD_DOWN_LEFT = 269; // 0x10d

    field public static final int KEYCODE_DPAD_DOWN_RIGHT = 271; // 0x10f

    field public static final int KEYCODE_DPAD_LEFT = 21; // 0x15

    field public static final int KEYCODE_DPAD_LEFT = 21; // 0x15

    field public static final int KEYCODE_DPAD_RIGHT = 22; // 0x16

    field public static final int KEYCODE_DPAD_RIGHT = 22; // 0x16

    field public static final int KEYCODE_DPAD_UP = 19; // 0x13

    field public static final int KEYCODE_DPAD_UP = 19; // 0x13

    field public static final int KEYCODE_DPAD_UP_LEFT = 268; // 0x10c

    field public static final int KEYCODE_DPAD_UP_RIGHT = 270; // 0x10e

    field public static final int KEYCODE_DVR = 173; // 0xad

    field public static final int KEYCODE_DVR = 173; // 0xad

    field public static final int KEYCODE_E = 33; // 0x21

    field public static final int KEYCODE_E = 33; // 0x21

    field public static final int KEYCODE_EISU = 212; // 0xd4

    field public static final int KEYCODE_EISU = 212; // 0xd4

core/java/android/view/KeyEvent.java

+10 −2
Original line number Original line Diff line number Diff line
@@ -770,8 +770,16 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    public static final int KEYCODE_STEM_2 = 266;

    public static final int KEYCODE_STEM_2 = 266;

    /** Key code constant: Generic stem key 3 for Wear */

    /** Key code constant: Generic stem key 3 for Wear */

    public static final int KEYCODE_STEM_3 = 267;

    public static final int KEYCODE_STEM_3 = 267;



    /** Key code constant: Directional Pad Up-Left */

    private static final int LAST_KEYCODE = KEYCODE_STEM_3;

    public static final int KEYCODE_DPAD_UP_LEFT    = 268;

    /** Key code constant: Directional Pad Down-Left */

    public static final int KEYCODE_DPAD_DOWN_LEFT  = 269;

    /** Key code constant: Directional Pad Up-Right */

    public static final int KEYCODE_DPAD_UP_RIGHT   = 270;

    /** Key code constant: Directional Pad Down-Right */

    public static final int KEYCODE_DPAD_DOWN_RIGHT = 271;



    private static final int LAST_KEYCODE = KEYCODE_DPAD_DOWN_RIGHT;





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

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

    //  isSystem()

    //  isSystem()

core/res/res/values/attrs.xml

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

        <enum name="KEYCODE_STEM_1" value="265" />

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

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

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

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

        <enum name="KEYCODE_DPAD_UP_LEFT" value="268" />

        <enum name="KEYCODE_DPAD_DOWN_LEFT" value="269" />

        <enum name="KEYCODE_DPAD_UP_RIGHT" value="270" />

        <enum name="KEYCODE_DPAD_DOWN_RIGHT" value="271" />

    </attr>

    </attr>





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

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