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

Commit a25d54ff 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 dd725ec4 dbd6abaf

api/current.txt

+28 −0
Original line number Diff line number Diff line
@@ -32916,6 +32916,7 @@ package android.view { 
    field public static final int KEYCODE_GUIDE = 172; // 0xac

    field public static final int KEYCODE_H = 36; // 0x24

    field public static final int KEYCODE_HEADSETHOOK = 79; // 0x4f

    field public static final int KEYCODE_HELP = 259; // 0x103

    field public static final int KEYCODE_HENKAN = 214; // 0xd6

    field public static final int KEYCODE_HOME = 3; // 0x3

    field public static final int KEYCODE_I = 37; // 0x25
@@ -33016,9 +33017,36 @@ package android.view { 
    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

    field public static final int KEYCODE_TV_ANTENNA_CABLE = 242; // 0xf2

    field public static final int KEYCODE_TV_AUDIO_DESCRIPTION = 252; // 0xfc

    field public static final int KEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN = 254; // 0xfe

    field public static final int KEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP = 253; // 0xfd

    field public static final int KEYCODE_TV_CONTENTS_MENU = 256; // 0x100

    field public static final int KEYCODE_TV_DATA_SERVICE = 230; // 0xe6

    field public static final int KEYCODE_TV_INPUT = 178; // 0xb2

    field public static final int KEYCODE_TV_INPUT_COMPONENT_1 = 249; // 0xf9

    field public static final int KEYCODE_TV_INPUT_COMPONENT_2 = 250; // 0xfa

    field public static final int KEYCODE_TV_INPUT_COMPOSITE_1 = 247; // 0xf7

    field public static final int KEYCODE_TV_INPUT_COMPOSITE_2 = 248; // 0xf8

    field public static final int KEYCODE_TV_INPUT_HDMI_1 = 243; // 0xf3

    field public static final int KEYCODE_TV_INPUT_HDMI_2 = 244; // 0xf4

    field public static final int KEYCODE_TV_INPUT_HDMI_3 = 245; // 0xf5

    field public static final int KEYCODE_TV_INPUT_HDMI_4 = 246; // 0xf6

    field public static final int KEYCODE_TV_INPUT_VGA_1 = 251; // 0xfb

    field public static final int KEYCODE_TV_MEDIA_CONTEXT_MENU = 257; // 0x101

    field public static final int KEYCODE_TV_NETWORK = 241; // 0xf1

    field public static final int KEYCODE_TV_NUMBER_ENTRY = 234; // 0xea

    field public static final int KEYCODE_TV_POWER = 177; // 0xb1

    field public static final int KEYCODE_TV_RADIO_SERVICE = 232; // 0xe8

    field public static final int KEYCODE_TV_SATELLITE = 237; // 0xed

    field public static final int KEYCODE_TV_SATELLITE_BS = 238; // 0xee

    field public static final int KEYCODE_TV_SATELLITE_CS = 239; // 0xef

    field public static final int KEYCODE_TV_SATELLITE_SERVICE = 240; // 0xf0

    field public static final int KEYCODE_TV_TELETEXT = 233; // 0xe9

    field public static final int KEYCODE_TV_TERRESTRIAL_ANALOG = 235; // 0xeb

    field public static final int KEYCODE_TV_TERRESTRIAL_DIGITAL = 236; // 0xec

    field public static final int KEYCODE_TV_TIMER_PROGRAMMING = 258; // 0x102

    field public static final int KEYCODE_TV_ZOOM_MODE = 255; // 0xff

    field public static final int KEYCODE_U = 49; // 0x31

    field public static final int KEYCODE_UNKNOWN = 0; // 0x0

    field public static final int KEYCODE_V = 50; // 0x32

core/java/android/view/KeyEvent.java

+90 −2
Original line number Diff line number Diff line
@@ -660,8 +660,96 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    /** Key code constant: Voice Assist key.

     * Launches the global voice assist activity. Not delivered to applications. */

    public static final int KEYCODE_VOICE_ASSIST = 231;



    private static final int LAST_KEYCODE = KEYCODE_VOICE_ASSIST;

    /** Key code constant: Radio key.

     * Toggles TV service / Radio service. */

    public static final int KEYCODE_TV_RADIO_SERVICE = 232;

    /** Key code constant: Teletext key.

     * Displays Teletext service. */

    public static final int KEYCODE_TV_TELETEXT = 233;

    /** Key code constant: Number entry key.

     * Initiates to enter multi-digit channel nubmber when each digit key is assigned

     * for selecting separate channel. Corresponds to Number Entry Mode (0x1D) of CEC

     * User Control Code. */

    public static final int KEYCODE_TV_NUMBER_ENTRY = 234;

    /** Key code constant: Analog Terrestrial key.

     * Switches to analog terrestrial broadcast service. */

    public static final int KEYCODE_TV_TERRESTRIAL_ANALOG = 235;

    /** Key code constant: Digital Terrestrial key.

     * Switches to digital terrestrial broadcast service. */

    public static final int KEYCODE_TV_TERRESTRIAL_DIGITAL = 236;

    /** Key code constant: Satellite key.

     * Switches to digital satellite broadcast service. */

    public static final int KEYCODE_TV_SATELLITE = 237;

    /** Key code constant: BS key.

     * Switches to BS digital satellite broadcasting service available in Japan. */

    public static final int KEYCODE_TV_SATELLITE_BS = 238;

    /** Key code constant: CS key.

     * Switches to CS digital satellite broadcasting service available in Japan. */

    public static final int KEYCODE_TV_SATELLITE_CS = 239;

    /** Key code constant: BS/CS key.

     * Toggles between BS and CS digital satellite services. */

    public static final int KEYCODE_TV_SATELLITE_SERVICE = 240;

    /** Key code constant: Toggle Network key.

     * Toggles selecting broacast services. */

    public static final int KEYCODE_TV_NETWORK = 241;

    /** Key code constant: Antenna/Cable key.

     * Toggles broadcast input source between antenna and cable. */

    public static final int KEYCODE_TV_ANTENNA_CABLE = 242;

    /** Key code constant: HDMI #1 key.

     * Switches to HDMI input #1. */

    public static final int KEYCODE_TV_INPUT_HDMI_1 = 243;

    /** Key code constant: HDMI #2 key.

     * Switches to HDMI input #2. */

    public static final int KEYCODE_TV_INPUT_HDMI_2 = 244;

    /** Key code constant: HDMI #3 key.

     * Switches to HDMI input #3. */

    public static final int KEYCODE_TV_INPUT_HDMI_3 = 245;

    /** Key code constant: HDMI #4 key.

     * Switches to HDMI input #4. */

    public static final int KEYCODE_TV_INPUT_HDMI_4 = 246;

    /** Key code constant: Composite #1 key.

     * Switches to composite video input #1. */

    public static final int KEYCODE_TV_INPUT_COMPOSITE_1 = 247;

    /** Key code constant: Composite #2 key.

     * Switches to composite video input #2. */

    public static final int KEYCODE_TV_INPUT_COMPOSITE_2 = 248;

    /** Key code constant: Component #1 key.

     * Switches to component video input #1. */

    public static final int KEYCODE_TV_INPUT_COMPONENT_1 = 249;

    /** Key code constant: Component #2 key.

     * Switches to component video input #2. */

    public static final int KEYCODE_TV_INPUT_COMPONENT_2 = 250;

    /** Key code constant: VGA #1 key.

     * Switches to VGA (analog RGB) input #1. */

    public static final int KEYCODE_TV_INPUT_VGA_1 = 251;

    /** Key code constant: Audio description key.

     * Toggles audio description off / on. */

    public static final int KEYCODE_TV_AUDIO_DESCRIPTION = 252;

    /** Key code constant: Audio description mixing volume up key.

     * Louden audio description volume as compared with normal audio volume. */

    public static final int KEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP = 253;

    /** Key code constant: Audio description mixing volume down key.

     * Lessen audio description volume as compared with normal audio volume. */

    public static final int KEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN = 254;

    /** Key code constant: Zoom mode key.

     * Changes Zoom mode (Normal, Full, Zoom, Wide-zoom, etc.) */

    public static final int KEYCODE_TV_ZOOM_MODE = 255;

    /** Key code constant: Contents menu key.

     * Goes to the title list. Corresponds to Contents Menu (0x0B) of CEC User Control

     * Code */

    public static final int KEYCODE_TV_CONTENTS_MENU = 256;

    /** Key code constant: Media context menu key.

     * Goes to the context menu of media contents. Corresponds to Media Context-sensitive

     * Menu (0x11) of CEC User Control Code. */

    public static final int KEYCODE_TV_MEDIA_CONTEXT_MENU = 257;

    /** Key code constant: Timer programming key.

     * Goes to the timer recording menu. Corresponds to Timer Programming (0x54) of

     * CEC User Control Code. */

    public static final int KEYCODE_TV_TIMER_PROGRAMMING = 258;

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

    public static final int KEYCODE_HELP = 259;



    private static final int LAST_KEYCODE = KEYCODE_HELP;



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

    //  isSystem()

core/res/res/values/attrs.xml

+28 −0
Original line number Diff line number Diff line
@@ -1726,6 +1726,34 @@ 
        <enum name="KEYCODE_LAST_CHANNEL" value="229" />

        <enum name="KEYCODE_TV_DATA_SERVICE" value="230" />

        <enum name="KEYCODE_VOICE_ASSIST" value="231" />

        <enum name="KEYCODE_TV_RADIO_SERVICE" value="232" />

        <enum name="KEYCODE_TV_TELETEXT" value="233" />

        <enum name="KEYCODE_TV_NUMBER_ENTRY" value="234" />

        <enum name="KEYCODE_TV_TERRESTRIAL_ANALOG" value="235" />

        <enum name="KEYCODE_TV_TERRESTRIAL_DIGITAL" value="236" />

        <enum name="KEYCODE_TV_SATELLITE" value="237" />

        <enum name="KEYCODE_TV_SATELLITE_BS" value="238" />

        <enum name="KEYCODE_TV_SATELLITE_CS" value="239" />

        <enum name="KEYCODE_TV_SATELLITE_SERVICE" value="240" />

        <enum name="KEYCODE_TV_NETWORK" value="241" />

        <enum name="KEYCODE_TV_ANTENNA_CABLE" value="242" />

        <enum name="KEYCODE_TV_INPUT_HDMI_1" value="243" />

        <enum name="KEYCODE_TV_INPUT_HDMI_2" value="244" />

        <enum name="KEYCODE_TV_INPUT_HDMI_3" value="245" />

        <enum name="KEYCODE_TV_INPUT_HDMI_4" value="246" />

        <enum name="KEYCODE_TV_INPUT_COMPOSITE_1" value="247" />

        <enum name="KEYCODE_TV_INPUT_COMPOSITE_2" value="248" />

        <enum name="KEYCODE_TV_INPUT_COMPONENT_1" value="249" />

        <enum name="KEYCODE_TV_INPUT_COMPONENT_2" value="250" />

        <enum name="KEYCODE_TV_INPUT_VGA_1" value="251" />

        <enum name="KEYCODE_TV_AUDIO_DESCRIPTION" value="252" />

        <enum name="KEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP" value="253" />

        <enum name="KEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN" value="254" />

        <enum name="KEYCODE_TV_ZOOM_MODE" value="255" />

        <enum name="KEYCODE_TV_CONTENTS_MENU" value="256" />

        <enum name="KEYCODE_TV_MEDIA_CONTEXT_MENU" value="257" />

        <enum name="KEYCODE_TV_TIMER_PROGRAMMING" value="258" />

        <enum name="KEYCODE_HELP" value="259" />

    </attr>



    <!-- ***************************************************************** -->