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

Commit b1bbfc2d authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Add Voice Assist key." into lmp-dev

parents eb21986d 51409573

include/android/keycodes.h

+2 −1
Original line number Diff line number Diff line
@@ -273,7 +273,8 @@ enum { 
    AKEYCODE_11              = 227,

    AKEYCODE_12              = 228,

    AKEYCODE_LAST_CHANNEL    = 229,

    AKEYCODE_TV_DATA_SERVICE = 230

    AKEYCODE_TV_DATA_SERVICE = 230,

    AKEYCODE_VOICE_ASSIST    = 231



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

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

    DEFINE_KEYCODE(LAST_CHANNEL),

    DEFINE_KEYCODE(TV_DATA_SERVICE),

    DEFINE_KEYCODE(VOICE_ASSIST),



    { NULL, 0 }

};