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

Commit 05200916 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Enable fingerprint sensor navigation to invoke QuickSettings - rename... 

Merge "Enable fingerprint sensor navigation to invoke QuickSettings - rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"" into nyc-mr1-dev
parents 0a3a75e1 07e0384a

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -41481,10 +41481,6 @@ package android.view { 
    field public static final int KEYCODE_FOCUS = 80; // 0x50

    field public static final int KEYCODE_FORWARD = 125; // 0x7d

    field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70

    field public static final int KEYCODE_FP_NAV_DOWN = 281; // 0x119

    field public static final int KEYCODE_FP_NAV_LEFT = 282; // 0x11a

    field public static final int KEYCODE_FP_NAV_RIGHT = 283; // 0x11b

    field public static final int KEYCODE_FP_NAV_UP = 280; // 0x118

    field public static final int KEYCODE_FUNCTION = 119; // 0x77

    field public static final int KEYCODE_G = 35; // 0x23

    field public static final int KEYCODE_GRAVE = 68; // 0x44
@@ -41603,6 +41599,10 @@ package android.view { 
    field public static final int KEYCODE_SWITCH_CHARSET = 95; // 0x5f

    field public static final int KEYCODE_SYM = 63; // 0x3f

    field public static final int KEYCODE_SYSRQ = 120; // 0x78

    field public static final int KEYCODE_SYSTEM_NAVIGATION_DOWN = 281; // 0x119

    field public static final int KEYCODE_SYSTEM_NAVIGATION_LEFT = 282; // 0x11a

    field public static final int KEYCODE_SYSTEM_NAVIGATION_RIGHT = 283; // 0x11b

    field public static final int KEYCODE_SYSTEM_NAVIGATION_UP = 280; // 0x118

    field public static final int KEYCODE_T = 48; // 0x30

    field public static final int KEYCODE_TAB = 61; // 0x3d

    field public static final int KEYCODE_TV = 170; // 0xaa

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -44585,10 +44585,6 @@ package android.view { 
    field public static final int KEYCODE_FOCUS = 80; // 0x50

    field public static final int KEYCODE_FORWARD = 125; // 0x7d

    field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70

    field public static final int KEYCODE_FP_NAV_DOWN = 281; // 0x119

    field public static final int KEYCODE_FP_NAV_LEFT = 282; // 0x11a

    field public static final int KEYCODE_FP_NAV_RIGHT = 283; // 0x11b

    field public static final int KEYCODE_FP_NAV_UP = 280; // 0x118

    field public static final int KEYCODE_FUNCTION = 119; // 0x77

    field public static final int KEYCODE_G = 35; // 0x23

    field public static final int KEYCODE_GRAVE = 68; // 0x44
@@ -44707,6 +44703,10 @@ package android.view { 
    field public static final int KEYCODE_SWITCH_CHARSET = 95; // 0x5f

    field public static final int KEYCODE_SYM = 63; // 0x3f

    field public static final int KEYCODE_SYSRQ = 120; // 0x78

    field public static final int KEYCODE_SYSTEM_NAVIGATION_DOWN = 281; // 0x119

    field public static final int KEYCODE_SYSTEM_NAVIGATION_LEFT = 282; // 0x11a

    field public static final int KEYCODE_SYSTEM_NAVIGATION_RIGHT = 283; // 0x11b

    field public static final int KEYCODE_SYSTEM_NAVIGATION_UP = 280; // 0x118

    field public static final int KEYCODE_T = 48; // 0x30

    field public static final int KEYCODE_TAB = 61; // 0x3d

    field public static final int KEYCODE_TV = 170; // 0xaa

api/test-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -41561,10 +41561,6 @@ package android.view { 
    field public static final int KEYCODE_FOCUS = 80; // 0x50

    field public static final int KEYCODE_FORWARD = 125; // 0x7d

    field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70

    field public static final int KEYCODE_FP_NAV_DOWN = 281; // 0x119

    field public static final int KEYCODE_FP_NAV_LEFT = 282; // 0x11a

    field public static final int KEYCODE_FP_NAV_RIGHT = 283; // 0x11b

    field public static final int KEYCODE_FP_NAV_UP = 280; // 0x118

    field public static final int KEYCODE_FUNCTION = 119; // 0x77

    field public static final int KEYCODE_G = 35; // 0x23

    field public static final int KEYCODE_GRAVE = 68; // 0x44
@@ -41683,6 +41679,10 @@ package android.view { 
    field public static final int KEYCODE_SWITCH_CHARSET = 95; // 0x5f

    field public static final int KEYCODE_SYM = 63; // 0x3f

    field public static final int KEYCODE_SYSRQ = 120; // 0x78

    field public static final int KEYCODE_SYSTEM_NAVIGATION_DOWN = 281; // 0x119

    field public static final int KEYCODE_SYSTEM_NAVIGATION_LEFT = 282; // 0x11a

    field public static final int KEYCODE_SYSTEM_NAVIGATION_RIGHT = 283; // 0x11b

    field public static final int KEYCODE_SYSTEM_NAVIGATION_UP = 280; // 0x118

    field public static final int KEYCODE_T = 48; // 0x30

    field public static final int KEYCODE_TAB = 61; // 0x3d

    field public static final int KEYCODE_TV = 170; // 0xaa

core/java/android/view/KeyEvent.java

+16 −13
Original line number Diff line number Diff line
@@ -796,16 +796,16 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    public static final int KEYCODE_COPY = 278;

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

    public static final int KEYCODE_PASTE = 279;

    /** Key code constant: fingerprint navigation up */

    public static final int KEYCODE_FP_NAV_UP = 280;

    /** Key code constant: fingerprint navigation down */

    public static final int KEYCODE_FP_NAV_DOWN = 281;

    /** Key code constant: fingerprint navigation left*/

    public static final int KEYCODE_FP_NAV_LEFT = 282;

    /** Key code constant: fingerprint navigation right */

    public static final int KEYCODE_FP_NAV_RIGHT = 283;

    /** Key code constant: Consumed by the system for navigation up */

    public static final int KEYCODE_SYSTEM_NAVIGATION_UP = 280;

    /** Key code constant: Consumed by the system for navigation down */

    public static final int KEYCODE_SYSTEM_NAVIGATION_DOWN = 281;

    /** Key code constant: Consumed by the system for navigation left*/

    public static final int KEYCODE_SYSTEM_NAVIGATION_LEFT = 282;

    /** Key code constant: Consumed by the system for navigation right */

    public static final int KEYCODE_SYSTEM_NAVIGATION_RIGHT = 283;



    private static final int LAST_KEYCODE = KEYCODE_FP_NAV_RIGHT;

    private static final int LAST_KEYCODE = KEYCODE_SYSTEM_NAVIGATION_RIGHT;



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

    //  isSystem()
@@ -1852,10 +1852,10 @@ public class KeyEvent extends InputEvent implements Parcelable { 
            case KeyEvent.KEYCODE_BRIGHTNESS_DOWN:

            case KeyEvent.KEYCODE_BRIGHTNESS_UP:

            case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:

            case KeyEvent.KEYCODE_FP_NAV_UP:

            case KeyEvent.KEYCODE_FP_NAV_DOWN:

            case KeyEvent.KEYCODE_FP_NAV_LEFT:

            case KeyEvent.KEYCODE_FP_NAV_RIGHT:

            case KeyEvent.KEYCODE_SYSTEM_NAVIGATION_UP:

            case KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN:

            case KeyEvent.KEYCODE_SYSTEM_NAVIGATION_LEFT:

            case KeyEvent.KEYCODE_SYSTEM_NAVIGATION_RIGHT:

                return true;

        }
@@ -2941,11 +2941,13 @@ public class KeyEvent extends InputEvent implements Parcelable { 


    public static final Parcelable.Creator<KeyEvent> CREATOR

            = new Parcelable.Creator<KeyEvent>() {

        @Override

        public KeyEvent createFromParcel(Parcel in) {

            in.readInt(); // skip token, we already know this is a KeyEvent

            return KeyEvent.createFromParcelBody(in);

        }



        @Override

        public KeyEvent[] newArray(int size) {

            return new KeyEvent[size];

        }
@@ -2969,6 +2971,7 @@ public class KeyEvent extends InputEvent implements Parcelable { 
        mEventTime = in.readLong();

    }



    @Override

    public void writeToParcel(Parcel out, int flags) {

        out.writeInt(PARCEL_TOKEN_KEY_EVENT);

core/java/com/android/internal/statusbar/IStatusBar.aidl

+1 −0
Original line number Diff line number Diff line
@@ -112,4 +112,5 @@ oneway interface IStatusBar 
    void addQsTile(in ComponentName tile);

    void remQsTile(in ComponentName tile);

    void clickQsTile(in ComponentName tile);

    void handleSystemNavigationKey(in int key);

}