diff options
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 12 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 4 |
4 files changed, 22 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 90dcec6f21f0..d3c30bfee2a4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35097,9 +35097,13 @@ package android.view { field public static final int KEYCODE_DEL = 67; // 0x43 field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17 field public static final int KEYCODE_DPAD_DOWN = 20; // 0x14 + field public static final int KEYCODE_DPAD_DOWN_LEFT = 269; // 0x10d + field public static final int KEYCODE_DPAD_DOWN_RIGHT = 271; // 0x10f field public static final int KEYCODE_DPAD_LEFT = 21; // 0x15 field public static final int KEYCODE_DPAD_RIGHT = 22; // 0x16 field public static final int KEYCODE_DPAD_UP = 19; // 0x13 + field public static final int KEYCODE_DPAD_UP_LEFT = 268; // 0x10c + field public static final int KEYCODE_DPAD_UP_RIGHT = 270; // 0x10e field public static final int KEYCODE_DVR = 173; // 0xad field public static final int KEYCODE_E = 33; // 0x21 field public static final int KEYCODE_EISU = 212; // 0xd4 diff --git a/api/system-current.txt b/api/system-current.txt index a715313f0cc9..91344339acde 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37407,9 +37407,13 @@ package android.view { field public static final int KEYCODE_DEL = 67; // 0x43 field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17 field public static final int KEYCODE_DPAD_DOWN = 20; // 0x14 + field public static final int KEYCODE_DPAD_DOWN_LEFT = 269; // 0x10d + field public static final int KEYCODE_DPAD_DOWN_RIGHT = 271; // 0x10f field public static final int KEYCODE_DPAD_LEFT = 21; // 0x15 field public static final int KEYCODE_DPAD_RIGHT = 22; // 0x16 field public static final int KEYCODE_DPAD_UP = 19; // 0x13 + field public static final int KEYCODE_DPAD_UP_LEFT = 268; // 0x10c + field public static final int KEYCODE_DPAD_UP_RIGHT = 270; // 0x10e field public static final int KEYCODE_DVR = 173; // 0xad field public static final int KEYCODE_E = 33; // 0x21 field public static final int KEYCODE_EISU = 212; // 0xd4 diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 75e6229fdd99..e77daa6218b4 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -770,8 +770,16 @@ public class KeyEvent extends InputEvent implements Parcelable { public static final int KEYCODE_STEM_2 = 266; /** Key code constant: Generic stem key 3 for Wear */ public static final int KEYCODE_STEM_3 = 267; - - private static final int LAST_KEYCODE = KEYCODE_STEM_3; + /** Key code constant: Directional Pad Up-Left */ + public static final int KEYCODE_DPAD_UP_LEFT = 268; + /** Key code constant: Directional Pad Down-Left */ + public static final int KEYCODE_DPAD_DOWN_LEFT = 269; + /** Key code constant: Directional Pad Up-Right */ + public static final int KEYCODE_DPAD_UP_RIGHT = 270; + /** Key code constant: Directional Pad Down-Right */ + public static final int KEYCODE_DPAD_DOWN_RIGHT = 271; + + private static final int LAST_KEYCODE = KEYCODE_DPAD_DOWN_RIGHT; // NOTE: If you add a new keycode here you must also add it to: // isSystem() diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 712272faafcb..99beef891040 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1810,6 +1810,10 @@ i <enum name="KEYCODE_STEM_1" value="265" /> <enum name="KEYCODE_STEM_2" value="266" /> <enum name="KEYCODE_STEM_3" value="267" /> + <enum name="KEYCODE_DPAD_UP_LEFT" value="268" /> + <enum name="KEYCODE_DPAD_DOWN_LEFT" value="269" /> + <enum name="KEYCODE_DPAD_UP_RIGHT" value="270" /> + <enum name="KEYCODE_DPAD_DOWN_RIGHT" value="271" /> </attr> <!-- ***************************************************************** --> |