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

Commit 19f8b79f authored by Wally Yau's avatar Wally Yau Committed by Android (Google) Code Review
Browse files

Merge "New keycode definitions for TV remotes." into lmp-dev

parents 08ff8021 5b3dc861

include/android/keycodes.h

+29 −1
Original line number Diff line number Diff line
@@ -274,7 +274,35 @@ enum { 
    AKEYCODE_12              = 228,

    AKEYCODE_LAST_CHANNEL    = 229,

    AKEYCODE_TV_DATA_SERVICE = 230,

    AKEYCODE_VOICE_ASSIST    = 231

    AKEYCODE_VOICE_ASSIST    = 231,

    AKEYCODE_TV_RADIO_SERVICE = 232,

    AKEYCODE_TV_TELETEXT     = 233,

    AKEYCODE_TV_NUMBER_ENTRY = 234,

    AKEYCODE_TV_TERRESTRIAL_ANALOG = 235,

    AKEYCODE_TV_TERRESTRIAL_DIGITAL = 236,

    AKEYCODE_TV_SATELLITE    = 237,

    AKEYCODE_TV_SATELLITE_BS = 238,

    AKEYCODE_TV_SATELLITE_CS = 239,

    AKEYCODE_TV_SATELLITE_SERVICE = 240,

    AKEYCODE_TV_NETWORK      = 241,

    AKEYCODE_TV_ANTENNA_CABLE = 242,

    AKEYCODE_TV_INPUT_HDMI_1 = 243,

    AKEYCODE_TV_INPUT_HDMI_2 = 244,

    AKEYCODE_TV_INPUT_HDMI_3 = 245,

    AKEYCODE_TV_INPUT_HDMI_4 = 246,

    AKEYCODE_TV_INPUT_COMPOSITE_1 = 247,

    AKEYCODE_TV_INPUT_COMPOSITE_2 = 248,

    AKEYCODE_TV_INPUT_COMPONENT_1 = 249,

    AKEYCODE_TV_INPUT_COMPONENT_2 = 250,

    AKEYCODE_TV_INPUT_VGA_1  = 251,

    AKEYCODE_TV_AUDIO_DESCRIPTION = 252,

    AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP = 253,

    AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN = 254,

    AKEYCODE_TV_ZOOM_MODE    = 255,

    AKEYCODE_TV_CONTENTS_MENU = 256,

    AKEYCODE_TV_MEDIA_CONTEXT_MENU = 257,

    AKEYCODE_TV_TIMER_PROGRAMMING = 258,

    AKEYCODE_HELP            = 259



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

+28 −0
Original line number Diff line number Diff line
@@ -271,6 +271,34 @@ static const InputEventLabel KEYCODES[] = { 
    DEFINE_KEYCODE(LAST_CHANNEL),

    DEFINE_KEYCODE(TV_DATA_SERVICE),

    DEFINE_KEYCODE(VOICE_ASSIST),

    DEFINE_KEYCODE(TV_RADIO_SERVICE),

    DEFINE_KEYCODE(TV_TELETEXT),

    DEFINE_KEYCODE(TV_NUMBER_ENTRY),

    DEFINE_KEYCODE(TV_TERRESTRIAL_ANALOG),

    DEFINE_KEYCODE(TV_TERRESTRIAL_DIGITAL),

    DEFINE_KEYCODE(TV_SATELLITE),

    DEFINE_KEYCODE(TV_SATELLITE_BS),

    DEFINE_KEYCODE(TV_SATELLITE_CS),

    DEFINE_KEYCODE(TV_SATELLITE_SERVICE),

    DEFINE_KEYCODE(TV_NETWORK),

    DEFINE_KEYCODE(TV_ANTENNA_CABLE),

    DEFINE_KEYCODE(TV_INPUT_HDMI_1),

    DEFINE_KEYCODE(TV_INPUT_HDMI_2),

    DEFINE_KEYCODE(TV_INPUT_HDMI_3),

    DEFINE_KEYCODE(TV_INPUT_HDMI_4),

    DEFINE_KEYCODE(TV_INPUT_COMPOSITE_1),

    DEFINE_KEYCODE(TV_INPUT_COMPOSITE_2),

    DEFINE_KEYCODE(TV_INPUT_COMPONENT_1),

    DEFINE_KEYCODE(TV_INPUT_COMPONENT_2),

    DEFINE_KEYCODE(TV_INPUT_VGA_1),

    DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION),

    DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION_MIX_UP),

    DEFINE_KEYCODE(TV_AUDIO_DESCRIPTION_MIX_DOWN),

    DEFINE_KEYCODE(TV_ZOOM_MODE),

    DEFINE_KEYCODE(TV_CONTENTS_MENU),

    DEFINE_KEYCODE(TV_MEDIA_CONTEXT_MENU),

    DEFINE_KEYCODE(TV_TIMER_PROGRAMMING),

    DEFINE_KEYCODE(HELP),



    { NULL, 0 }

};