diff options
| -rw-r--r-- | api/current.xml | 242 | ||||
| -rwxr-xr-x | core/java/android/view/KeyEvent.java | 91 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 22 | ||||
| -rwxr-xr-x | include/ui/KeycodeLabels.h | 22 | ||||
| -rw-r--r-- | native/include/android/keycodes.h | 22 |
5 files changed, 397 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml index bf5c8a0..bad739f0 100644 --- a/api/current.xml +++ b/api/current.xml @@ -195662,6 +195662,28 @@ visibility="public" > </field> +<field name="KEYCODE_AVR_INPUT" + type="int" + transient="false" + volatile="false" + value="182" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_AVR_POWER" + type="int" + transient="false" + volatile="false" + value="181" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_B" type="int" transient="false" @@ -195695,6 +195717,17 @@ visibility="public" > </field> +<field name="KEYCODE_BOOKMARK" + type="int" + transient="false" + volatile="false" + value="174" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_BREAK" type="int" transient="false" @@ -195915,6 +195948,39 @@ visibility="public" > </field> +<field name="KEYCODE_CAPTIONS" + type="int" + transient="false" + volatile="false" + value="175" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_CHANNEL_DOWN" + type="int" + transient="false" + volatile="false" + value="167" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_CHANNEL_UP" + type="int" + transient="false" + volatile="false" + value="166" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_CLEAR" type="int" transient="false" @@ -196036,6 +196102,17 @@ visibility="public" > </field> +<field name="KEYCODE_DVR" + type="int" + transient="false" + volatile="false" + value="173" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_E" type="int" transient="false" @@ -196322,6 +196399,17 @@ visibility="public" > </field> +<field name="KEYCODE_GUIDE" + type="int" + transient="false" + volatile="false" + value="172" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_H" type="int" transient="false" @@ -196366,6 +196454,17 @@ visibility="public" > </field> +<field name="KEYCODE_INFO" + type="int" + transient="false" + volatile="false" + value="165" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_INSERT" type="int" transient="false" @@ -196993,6 +197092,50 @@ visibility="public" > </field> +<field name="KEYCODE_PROG_BLUE" + type="int" + transient="false" + volatile="false" + value="186" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_PROG_GREEN" + type="int" + transient="false" + volatile="false" + value="184" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_PROG_RED" + type="int" + transient="false" + volatile="false" + value="183" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_PROG_YELLOW" + type="int" + transient="false" + volatile="false" + value="185" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_Q" type="int" transient="false" @@ -197070,6 +197213,17 @@ visibility="public" > </field> +<field name="KEYCODE_SETTINGS" + type="int" + transient="false" + volatile="false" + value="176" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_SHIFT_LEFT" type="int" transient="false" @@ -197147,6 +197301,28 @@ visibility="public" > </field> +<field name="KEYCODE_STB_INPUT" + type="int" + transient="false" + volatile="false" + value="180" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_STB_POWER" + type="int" + transient="false" + volatile="false" + value="179" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_SWITCH_CHARSET" type="int" transient="false" @@ -197202,6 +197378,39 @@ visibility="public" > </field> +<field name="KEYCODE_TV" + type="int" + transient="false" + volatile="false" + value="170" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_TV_INPUT" + type="int" + transient="false" + volatile="false" + value="178" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_TV_POWER" + type="int" + transient="false" + volatile="false" + value="177" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_U" type="int" transient="false" @@ -197279,6 +197488,17 @@ visibility="public" > </field> +<field name="KEYCODE_WINDOW" + type="int" + transient="false" + volatile="false" + value="171" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_X" type="int" transient="false" @@ -197312,6 +197532,28 @@ visibility="public" > </field> +<field name="KEYCODE_ZOOM_IN" + type="int" + transient="false" + volatile="false" + value="168" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_ZOOM_OUT" + type="int" + transient="false" + volatile="false" + value="169" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="MAX_KEYCODE" type="int" transient="false" diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index e7a16a2..63c1137 100755 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -463,8 +463,73 @@ public class KeyEvent extends InputEvent implements Parcelable { * This key should normally be implemented as a toggle such that the first press * mutes the speaker and the second press restores the original volume. */ public static final int KEYCODE_VOLUME_MUTE = 164; - - private static final int LAST_KEYCODE = KEYCODE_VOLUME_MUTE; + /** Key code constant: Info key. + * Common on TV remotes to show additional information related to what is + * currently being viewed. */ + public static final int KEYCODE_INFO = 165; + /** Key code constant: Channel up key. + * On TV remotes, increments the television channel. */ + public static final int KEYCODE_CHANNEL_UP = 166; + /** Key code constant: Channel down key. + * On TV remotes, decrements the television channel. */ + public static final int KEYCODE_CHANNEL_DOWN = 167; + /** Key code constant: Zoom in key. */ + public static final int KEYCODE_ZOOM_IN = 168; + /** Key code constant: Zoom out key. */ + public static final int KEYCODE_ZOOM_OUT = 169; + /** Key code constant: TV key. + * On TV remotes, switches to viewing live TV. */ + public static final int KEYCODE_TV = 170; + /** Key code constant: Window key. + * On TV remotes, toggles picture-in-picture mode or other windowing functions. */ + public static final int KEYCODE_WINDOW = 171; + /** Key code constant: Guide key. + * On TV remotes, shows a programming guide. */ + public static final int KEYCODE_GUIDE = 172; + /** Key code constant: DVR key. + * On some TV remotes, switches to a DVR mode for recorded shows. */ + public static final int KEYCODE_DVR = 173; + /** Key code constant: Bookmark key. + * On some TV remotes, bookmarks content or web pages. */ + public static final int KEYCODE_BOOKMARK = 174; + /** Key code constant: Toggle captions key. + * Switches the mode for closed-captioning text, for example during television shows. */ + public static final int KEYCODE_CAPTIONS = 175; + /** Key code constant: Settings key. + * Starts the system settings activity. */ + public static final int KEYCODE_SETTINGS = 176; + /** Key code constant: TV power key. + * On TV remotes, toggles the power on a television screen. */ + public static final int KEYCODE_TV_POWER = 177; + /** Key code constant: TV input key. + * On TV remotes, switches the input on a television screen. */ + public static final int KEYCODE_TV_INPUT = 178; + /** Key code constant: Set-top-box power key. + * On TV remotes, toggles the power on an external Set-top-box. */ + public static final int KEYCODE_STB_POWER = 179; + /** Key code constant: Set-top-box input key. + * On TV remotes, switches the input mode on an external Set-top-box. */ + public static final int KEYCODE_STB_INPUT = 180; + /** Key code constant: A/V Receiver power key. + * On TV remotes, toggles the power on an external A/V Receiver. */ + public static final int KEYCODE_AVR_POWER = 181; + /** Key code constant: A/V Receiver input key. + * On TV remotes, switches the input mode on an external A/V Receiver. */ + public static final int KEYCODE_AVR_INPUT = 182; + /** Key code constant: Red "programmable" key. + * On TV remotes, acts as a contextual/programmable key. */ + public static final int KEYCODE_PROG_RED = 183; + /** Key code constant: Green "programmable" key. + * On TV remotes, actsas a contextual/programmable key. */ + public static final int KEYCODE_PROG_GREEN = 184; + /** Key code constant: Yellow "programmable" key. + * On TV remotes, acts as a contextual/programmable key. */ + public static final int KEYCODE_PROG_YELLOW = 185; + /** Key code constant: Blue "programmable" key. + * On TV remotes, acts as a contextual/programmable key. */ + public static final int KEYCODE_PROG_BLUE = 186; + + private static final int LAST_KEYCODE = KEYCODE_PROG_BLUE; // NOTE: If you add a new keycode here you must also add it to: // isSystem() @@ -649,6 +714,28 @@ public class KeyEvent extends InputEvent implements Parcelable { "KEYCODE_NUMPAD_LEFT_PAREN", "KEYCODE_NUMPAD_RIGHT_PAREN", "KEYCODE_VOLUME_MUTE", + "KEYCODE_INFO", + "KEYCODE_CHANNEL_UP", + "KEYCODE_CHANNEL_DOWN", + "KEYCODE_ZOOM_IN", + "KEYCODE_ZOOM_OUT", + "KEYCODE_TV", + "KEYCODE_WINDOW", + "KEYCODE_GUIDE", + "KEYCODE_DVR", + "KEYCODE_BOOKMARK", + "KEYCODE_CAPTIONS", + "KEYCODE_SETTINGS", + "KEYCODE_TV_POWER", + "KEYCODE_TV_INPUT", + "KEYCODE_STB_INPUT", + "KEYCODE_STB_POWER", + "KEYCODE_AVR_POWER", + "KEYCODE_AVR_INPUT", + "KEYCODE_PROG_RED", + "KEYCODE_PROG_GREEN", + "KEYCODE_PROG_YELLOW", + "KEYCODE_PROG_BLUE", }; // Symbolic names of all metakeys in bit order from least significant to most significant. diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 115e59d..7ff75b3 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1170,6 +1170,28 @@ <enum name="KEYCODE_NUMPAD_LEFT_PAREN" value="162" /> <enum name="KEYCODE_NUMPAD_RIGHT_PAREN" value="163" /> <enum name="KEYCODE_VOLUME_MUTE" value="164" /> + <enum name="KEYCODE_INFO" value="165" /> + <enum name="KEYCODE_CHANNEL_UP" value="166" /> + <enum name="KEYCODE_CHANNEL_DOWN" value="167" /> + <enum name="KEYCODE_ZOOM_IN" value="168" /> + <enum name="KEYCODE_ZOOM_OUT" value="169" /> + <enum name="KEYCODE_TV" value="170" /> + <enum name="KEYCODE_WINDOW" value="171" /> + <enum name="KEYCODE_GUIDE" value="172" /> + <enum name="KEYCODE_DVR" value="173" /> + <enum name="KEYCODE_BOOKMARK" value="174" /> + <enum name="KEYCODE_CAPTIONS" value="175" /> + <enum name="KEYCODE_SETTINGS" value="176" /> + <enum name="KEYCODE_TV_POWER" value="177" /> + <enum name="KEYCODE_TV_INPUT" value="178" /> + <enum name="KEYCODE_STB_POWER" value="179" /> + <enum name="KEYCODE_STB_INPUT" value="180" /> + <enum name="KEYCODE_AVR_POWER" value="181" /> + <enum name="KEYCODE_AVR_INPUT" value="182" /> + <enum name="KEYCODE_PROG_GRED" value="183" /> + <enum name="KEYCODE_PROG_GREEN" value="184" /> + <enum name="KEYCODE_PROG_YELLOW" value="185" /> + <enum name="KEYCODE_PROG_BLUE" value="186" /> </attr> <!-- ***************************************************************** --> diff --git a/include/ui/KeycodeLabels.h b/include/ui/KeycodeLabels.h index 73f5863..be7db1f 100755 --- a/include/ui/KeycodeLabels.h +++ b/include/ui/KeycodeLabels.h @@ -189,6 +189,28 @@ static const KeycodeLabel KEYCODES[] = { { "NUMPAD_LEFT_PAREN", 162 }, { "NUMPAD_RIGHT_PAREN", 163 }, { "VOLUME_MUTE", 164 }, + { "INFO", 165 }, + { "CHANNEL_UP", 166 }, + { "CHANNEL_DOWN", 167 }, + { "ZOOM_IN", 168 }, + { "ZOOM_OUT", 169 }, + { "TV", 170 }, + { "WINDOW", 171 }, + { "GUIDE", 172 }, + { "DVR", 173 }, + { "BOOKMARK", 174 }, + { "CAPTIONS", 175 }, + { "SETTINGS", 176 }, + { "TV_POWER", 177 }, + { "TV_INPUT", 178 }, + { "STB_POWER", 179 }, + { "STB_INPUT", 180 }, + { "AVR_POWER", 181 }, + { "AVR_INPUT", 182 }, + { "PROG_RED", 183 }, + { "PROG_GREEN", 184 }, + { "PROG_YELLOW", 185 }, + { "PROG_BLUE", 186 }, // 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. diff --git a/native/include/android/keycodes.h b/native/include/android/keycodes.h index 11142537..5f33ad5 100644 --- a/native/include/android/keycodes.h +++ b/native/include/android/keycodes.h @@ -208,6 +208,28 @@ enum { AKEYCODE_NUMPAD_LEFT_PAREN = 162, AKEYCODE_NUMPAD_RIGHT_PAREN = 163, AKEYCODE_VOLUME_MUTE = 164, + AKEYCODE_INFO = 165, + AKEYCODE_CHANNEL_UP = 166, + AKEYCODE_CHANNEL_DOWN = 167, + AKEYCODE_ZOOM_IN = 168, + AKEYCODE_ZOOM_OUT = 169, + AKEYCODE_TV = 170, + AKEYCODE_WINDOW = 171, + AKEYCODE_GUIDE = 172, + AKEYCODE_DVR = 173, + AKEYCODE_BOOKMARK = 174, + AKEYCODE_CAPTIONS = 175, + AKEYCODE_SETTINGS = 176, + AKEYCODE_TV_POWER = 177, + AKEYCODE_TV_INPUT = 178, + AKEYCODE_STB_POWER = 179, + AKEYCODE_STB_INPUT = 180, + AKEYCODE_AVR_POWER = 181, + AKEYCODE_AVR_INPUT = 182, + AKEYCODE_PROG_RED = 183, + AKEYCODE_PROG_GREEN = 184, + AKEYCODE_PROG_YELLOW = 185, + AKEYCODE_PROG_BLUE = 186, // 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. |