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

Commit 047fcbf6 authored by Sujith Ramakrishnan's avatar Sujith Ramakrishnan Committed by android-build-merger
Browse files

Merge "Add a new keycode for TV (ALL_APPS)" into oc-dev 

am: 6afce442

Change-Id: I7933009ee4c64025245373ee6b5ad1b0d77291e9
parents cefb8a67 6afce442

include/android/keycodes.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -765,7 +765,9 @@ enum { 
    /** fingerprint navigation key, left. */

    /** fingerprint navigation key, left. */

    AKEYCODE_SYSTEM_NAVIGATION_LEFT = 282,

    AKEYCODE_SYSTEM_NAVIGATION_LEFT = 282,

    /** fingerprint navigation key, right. */

    /** fingerprint navigation key, right. */

    AKEYCODE_SYSTEM_NAVIGATION_RIGHT = 283

    AKEYCODE_SYSTEM_NAVIGATION_RIGHT = 283,

    /** all apps */

    AKEYCODE_ALL_APPS = 284





    // NOTE: If you add a new keycode here you must also add it to several other files.

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

    //       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

include/input/InputEventLabels.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -323,6 +323,7 @@ static const InputEventLabel KEYCODES[] = { 
    DEFINE_KEYCODE(SYSTEM_NAVIGATION_DOWN),

    DEFINE_KEYCODE(SYSTEM_NAVIGATION_DOWN),

    DEFINE_KEYCODE(SYSTEM_NAVIGATION_LEFT),

    DEFINE_KEYCODE(SYSTEM_NAVIGATION_LEFT),

    DEFINE_KEYCODE(SYSTEM_NAVIGATION_RIGHT),

    DEFINE_KEYCODE(SYSTEM_NAVIGATION_RIGHT),

    DEFINE_KEYCODE(ALL_APPS),





    { NULL, 0 }

    { NULL, 0 }

};

};