diff options
| -rw-r--r-- | api/current.xml | 35 | ||||
| -rwxr-xr-x | core/java/android/view/KeyEvent.java | 16 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 3 | ||||
| -rwxr-xr-x | include/ui/KeycodeLabels.h | 3 | ||||
| -rw-r--r-- | native/include/android/keycodes.h | 3 |
5 files changed, 59 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index 1b3c731..a088975 100644 --- a/api/current.xml +++ b/api/current.xml @@ -213150,6 +213150,17 @@ visibility="public" > </field> +<field name="KEYCODE_3D_MODE" + type="int" + transient="false" + volatile="false" + value="206" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_4" type="int" transient="false" @@ -214305,6 +214316,17 @@ visibility="public" > </field> +<field name="KEYCODE_LANGUAGE_SWITCH" + type="int" + transient="false" + volatile="false" + value="204" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_LEFT_BRACKET" type="int" transient="false" @@ -214327,6 +214349,17 @@ visibility="public" > </field> +<field name="KEYCODE_MANNER_MODE" + type="int" + transient="false" + volatile="false" + value="205" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_MEDIA_CLOSE" type="int" transient="false" @@ -220788,7 +220821,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="ev" type="android.view.MotionEvent"> +<parameter name="event" type="android.view.MotionEvent"> </parameter> </method> <method name="clear" diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 81d5a6e..8070c6a 100755 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -566,6 +566,19 @@ public class KeyEvent extends InputEvent implements Parcelable { public static final int KEYCODE_BUTTON_15 = 202; /** Key code constant: Generic Game Pad Button #16.*/ public static final int KEYCODE_BUTTON_16 = 203; + /** Key code constant: Language Switch key. + * Toggles the current input language such as switching between English and Japanese on + * a QWERTY keyboard. On some devices, the same function may be performed by + * pressing Shift+Spacebar. */ + public static final int KEYCODE_LANGUAGE_SWITCH = 204; + /** Key code constant: Manner Mode key. + * Toggles silent or vibrate mode on and off to make the device behave more politely + * in certain settings such as on a crowded train. On some devices, the key may only + * operate when long-pressed. */ + public static final int KEYCODE_MANNER_MODE = 205; + /** Key code constant: 3D Mode key. + * Toggles the display between 2D and 3D mode. */ + public static final int KEYCODE_3D_MODE = 206; private static final int LAST_KEYCODE = KEYCODE_BUTTON_16; @@ -791,6 +804,9 @@ public class KeyEvent extends InputEvent implements Parcelable { names.append(KEYCODE_BUTTON_14, "KEYCODE_BUTTON_14"); names.append(KEYCODE_BUTTON_15, "KEYCODE_BUTTON_15"); names.append(KEYCODE_BUTTON_16, "KEYCODE_BUTTON_16"); + names.append(KEYCODE_LANGUAGE_SWITCH, "KEYCODE_LANGUAGE_SWITCH"); + names.append(KEYCODE_MANNER_MODE, "KEYCODE_MANNER_MODE"); + names.append(KEYCODE_3D_MODE, "KEYCODE_3D_MODE"); }; // 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 71a8b2a..c81f8c0 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1374,6 +1374,9 @@ <enum name="KEYCODE_BUTTON_14" value="201" /> <enum name="KEYCODE_BUTTON_15" value="202" /> <enum name="KEYCODE_BUTTON_16" value="203" /> + <enum name="KEYCODE_LANGUAGE_SWITCH" value="204" /> + <enum name="KEYCODE_MANNER_MODE" value="205" /> + <enum name="KEYCODE_3D_MODE" value="206" /> </attr> <!-- ***************************************************************** --> diff --git a/include/ui/KeycodeLabels.h b/include/ui/KeycodeLabels.h index b912e9b..8383957 100755 --- a/include/ui/KeycodeLabels.h +++ b/include/ui/KeycodeLabels.h @@ -228,6 +228,9 @@ static const KeycodeLabel KEYCODES[] = { { "BUTTON_14", 201 }, { "BUTTON_15", 202 }, { "BUTTON_16", 203 }, + { "LANGUAGE_SWITCH", 204 }, + { "MANNER_MODE", 205 }, + { "3D_MODE", 206 }, // 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 c4a7eff..5d49775 100644 --- a/native/include/android/keycodes.h +++ b/native/include/android/keycodes.h @@ -247,6 +247,9 @@ enum { AKEYCODE_BUTTON_14 = 201, AKEYCODE_BUTTON_15 = 202, AKEYCODE_BUTTON_16 = 203, + AKEYCODE_LANGUAGE_SWITCH = 204, + AKEYCODE_MANNER_MODE = 205, + AKEYCODE_3D_MODE = 206, // 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. |