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

Commit b2011104 authored by Joseph Cooper's avatar Joseph Cooper Committed by Android (Google) Code Review
Browse files

Merge "Introduces navigation keycodes."

parents 225d0662 55b9ed42

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -35046,6 +35046,10 @@ package android.view { 
    field public static final int KEYCODE_MUSIC = 209; // 0xd1

    field public static final int KEYCODE_MUTE = 91; // 0x5b

    field public static final int KEYCODE_N = 42; // 0x2a

    field public static final int KEYCODE_NAVIGATE_IN = 262; // 0x106

    field public static final int KEYCODE_NAVIGATE_NEXT = 261; // 0x105

    field public static final int KEYCODE_NAVIGATE_OUT = 263; // 0x107

    field public static final int KEYCODE_NAVIGATE_PREVIOUS = 260; // 0x104

    field public static final int KEYCODE_NOTIFICATION = 83; // 0x53

    field public static final int KEYCODE_NUM = 78; // 0x4e

    field public static final int KEYCODE_NUMPAD_0 = 144; // 0x90

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -37245,6 +37245,10 @@ package android.view { 
    field public static final int KEYCODE_MUSIC = 209; // 0xd1

    field public static final int KEYCODE_MUTE = 91; // 0x5b

    field public static final int KEYCODE_N = 42; // 0x2a

    field public static final int KEYCODE_NAVIGATE_IN = 262; // 0x106

    field public static final int KEYCODE_NAVIGATE_NEXT = 261; // 0x105

    field public static final int KEYCODE_NAVIGATE_OUT = 263; // 0x107

    field public static final int KEYCODE_NAVIGATE_PREVIOUS = 260; // 0x104

    field public static final int KEYCODE_NOTIFICATION = 83; // 0x53

    field public static final int KEYCODE_NUM = 78; // 0x4e

    field public static final int KEYCODE_NUMPAD_0 = 144; // 0x90

core/java/android/view/KeyEvent.java

+16 −2
Original line number Diff line number Diff line
@@ -747,8 +747,22 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    public static final int KEYCODE_TV_TIMER_PROGRAMMING = 258;

    /** Key code constant: Help key. */

    public static final int KEYCODE_HELP = 259;



    private static final int LAST_KEYCODE = KEYCODE_HELP;

    /** Key code constant: Navigate to previous key. 

     * Goes backward by one item in an ordered collection of items. */

    public static final int KEYCODE_NAVIGATE_PREVIOUS = 260;

    /** Key code constant: Navigate to next key. 

     * Advances to the next item in an ordered collection of items. */

    public static final int KEYCODE_NAVIGATE_NEXT   = 261;

    /** Key code constant: Navigate in key.

     * Activates the item that currently has focus or expands to the next level of a navigation 

     * hierarchy. */

    public static final int KEYCODE_NAVIGATE_IN     = 262;

    /** Key code constant: Navigate out key.

     * Backs out one level of a navigation hierarchy or collapses the item that currently has 

     * focus. */

    public static final int KEYCODE_NAVIGATE_OUT    = 263;



    private static final int LAST_KEYCODE = KEYCODE_NAVIGATE_OUT;



    // 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
@@ -1783,6 +1783,10 @@ 
        <enum name="KEYCODE_TV_MEDIA_CONTEXT_MENU" value="257" />

        <enum name="KEYCODE_TV_TIMER_PROGRAMMING" value="258" />

        <enum name="KEYCODE_HELP" value="259" />

        <enum name="KEYCODE_NAVIGATE_PREVIOUS" value="260" />

        <enum name="KEYCODE_NAVIGATE_NEXT" value="261" />

        <enum name="KEYCODE_NAVIGATE_IN" value="262" />

        <enum name="KEYCODE_NAVIGATE_OUT" value="263" />

    </attr>



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