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

Commit e7a57d12 authored by Jim Miller's avatar Jim Miller
Browse files

Enable fingerprint sensor navigation to invoke QuickSettings 

- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION" based on other reviews.

Fixes bug 28869612

Change-Id: I384c0fa372a2ecda7250fccd0dbdfd6312423a85
parent 18f0dd48

include/android/keycodes.h

+4 −4
Original line number Diff line number Diff line
@@ -759,13 +759,13 @@ enum { 
    /** Paste key. */

    AKEYCODE_PASTE = 279,

    /** fingerprint navigation key, up. */

    AKEYCODE_FP_NAV_UP = 280,

    AKEYCODE_SYSTEM_NAVIGATION_UP = 280,

    /** fingerprint navigation key, down. */

    AKEYCODE_FP_NAV_DOWN = 281,

    AKEYCODE_SYSTEM_NAVIGATION_DOWN = 281,

    /** fingerprint navigation key, left. */

    AKEYCODE_FP_NAV_LEFT = 282,

    AKEYCODE_SYSTEM_NAVIGATION_LEFT = 282,

    /** fingerprint navigation key, right. */

    AKEYCODE_FP_NAV_RIGHT = 283

    AKEYCODE_SYSTEM_NAVIGATION_RIGHT = 283



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

include/input/InputEventLabels.h

+4 −4
Original line number Diff line number Diff line
@@ -319,10 +319,10 @@ static const InputEventLabel KEYCODES[] = { 
    DEFINE_KEYCODE(CUT),

    DEFINE_KEYCODE(COPY),

    DEFINE_KEYCODE(PASTE),

    DEFINE_KEYCODE(FP_NAV_UP),

    DEFINE_KEYCODE(FP_NAV_DOWN),

    DEFINE_KEYCODE(FP_NAV_LEFT),

    DEFINE_KEYCODE(FP_NAV_RIGHT),

    DEFINE_KEYCODE(SYSTEM_NAVIGATION_UP),

    DEFINE_KEYCODE(SYSTEM_NAVIGATION_DOWN),

    DEFINE_KEYCODE(SYSTEM_NAVIGATION_LEFT),

    DEFINE_KEYCODE(SYSTEM_NAVIGATION_RIGHT),



    { NULL, 0 }

};

services/inputflinger/InputReader.cpp

+8 −4
Original line number Diff line number Diff line
@@ -134,10 +134,14 @@ static const int32_t keyCodeRotationMap[][4] = { 
        { AKEYCODE_DPAD_RIGHT,  AKEYCODE_DPAD_UP,     AKEYCODE_DPAD_LEFT,   AKEYCODE_DPAD_DOWN },

        { AKEYCODE_DPAD_UP,     AKEYCODE_DPAD_LEFT,   AKEYCODE_DPAD_DOWN,   AKEYCODE_DPAD_RIGHT },

        { AKEYCODE_DPAD_LEFT,   AKEYCODE_DPAD_DOWN,   AKEYCODE_DPAD_RIGHT,  AKEYCODE_DPAD_UP },

        { AKEYCODE_FP_NAV_DOWN,   AKEYCODE_FP_NAV_RIGHT,  AKEYCODE_FP_NAV_UP,     AKEYCODE_FP_NAV_LEFT },

        { AKEYCODE_FP_NAV_RIGHT,  AKEYCODE_FP_NAV_UP,     AKEYCODE_FP_NAV_LEFT,   AKEYCODE_FP_NAV_DOWN },

        { AKEYCODE_FP_NAV_UP,     AKEYCODE_FP_NAV_LEFT,   AKEYCODE_FP_NAV_DOWN,   AKEYCODE_FP_NAV_RIGHT },

        { AKEYCODE_FP_NAV_LEFT,   AKEYCODE_FP_NAV_DOWN,   AKEYCODE_FP_NAV_RIGHT,  AKEYCODE_FP_NAV_UP },

        { AKEYCODE_SYSTEM_NAVIGATION_DOWN, AKEYCODE_SYSTEM_NAVIGATION_RIGHT,

            AKEYCODE_SYSTEM_NAVIGATION_UP, AKEYCODE_SYSTEM_NAVIGATION_LEFT },

        { AKEYCODE_SYSTEM_NAVIGATION_RIGHT, AKEYCODE_SYSTEM_NAVIGATION_UP,

            AKEYCODE_SYSTEM_NAVIGATION_LEFT, AKEYCODE_SYSTEM_NAVIGATION_DOWN },

        { AKEYCODE_SYSTEM_NAVIGATION_UP, AKEYCODE_SYSTEM_NAVIGATION_LEFT,

            AKEYCODE_SYSTEM_NAVIGATION_DOWN, AKEYCODE_SYSTEM_NAVIGATION_RIGHT },

        { AKEYCODE_SYSTEM_NAVIGATION_LEFT, AKEYCODE_SYSTEM_NAVIGATION_DOWN,

            AKEYCODE_SYSTEM_NAVIGATION_RIGHT, AKEYCODE_SYSTEM_NAVIGATION_UP },

};

static const size_t keyCodeRotationMapSize =

        sizeof(keyCodeRotationMap) / sizeof(keyCodeRotationMap[0]);