diff options
| author | Joseph Cooper <josephcooper@google.com> | 2015-04-21 15:31:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-21 15:31:46 +0000 |
| commit | b201110437f6bcb0c96aa70bb5f17d8d8d0597d9 (patch) | |
| tree | 771e776a473638a6e4423de68af861fb57e57190 | |
| parent | 225d06624a86bdfdd7ced5c9f04b2ac834878727 (diff) | |
| parent | 55b9ed42d3e1f61794d23cd0f4a04d01c51eab14 (diff) | |
| download | frameworks_base-b201110437f6bcb0c96aa70bb5f17d8d8d0597d9.zip frameworks_base-b201110437f6bcb0c96aa70bb5f17d8d8d0597d9.tar.gz frameworks_base-b201110437f6bcb0c96aa70bb5f17d8d8d0597d9.tar.bz2 | |
Merge "Introduces navigation keycodes."
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 18 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 4 |
4 files changed, 28 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 058053b..44cbe7b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35046,6 +35046,10 @@ package android.view { field public static final int KEYCODE_MUSIC = 209; // 0xd1 field public static final int KEYCODE_MUTE = 91; // 0x5b field public static final int KEYCODE_N = 42; // 0x2a + field public static final int KEYCODE_NAVIGATE_IN = 262; // 0x106 + field public static final int KEYCODE_NAVIGATE_NEXT = 261; // 0x105 + field public static final int KEYCODE_NAVIGATE_OUT = 263; // 0x107 + field public static final int KEYCODE_NAVIGATE_PREVIOUS = 260; // 0x104 field public static final int KEYCODE_NOTIFICATION = 83; // 0x53 field public static final int KEYCODE_NUM = 78; // 0x4e field public static final int KEYCODE_NUMPAD_0 = 144; // 0x90 diff --git a/api/system-current.txt b/api/system-current.txt index 24da8782..9d3a3c9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37245,6 +37245,10 @@ package android.view { field public static final int KEYCODE_MUSIC = 209; // 0xd1 field public static final int KEYCODE_MUTE = 91; // 0x5b field public static final int KEYCODE_N = 42; // 0x2a + field public static final int KEYCODE_NAVIGATE_IN = 262; // 0x106 + field public static final int KEYCODE_NAVIGATE_NEXT = 261; // 0x105 + field public static final int KEYCODE_NAVIGATE_OUT = 263; // 0x107 + field public static final int KEYCODE_NAVIGATE_PREVIOUS = 260; // 0x104 field public static final int KEYCODE_NOTIFICATION = 83; // 0x53 field public static final int KEYCODE_NUM = 78; // 0x4e field public static final int KEYCODE_NUMPAD_0 = 144; // 0x90 diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 779560c..1ac3f45 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -747,8 +747,22 @@ public class KeyEvent extends InputEvent implements Parcelable { 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; + /** Key code constant: Navigate to previous key. + * Goes backward by one item in an ordered collection of items. */ + public static final int KEYCODE_NAVIGATE_PREVIOUS = 260; + /** Key code constant: Navigate to next key. + * Advances to the next item in an ordered collection of items. */ + public static final int KEYCODE_NAVIGATE_NEXT = 261; + /** Key code constant: Navigate in key. + * Activates the item that currently has focus or expands to the next level of a navigation + * hierarchy. */ + public static final int KEYCODE_NAVIGATE_IN = 262; + /** Key code constant: Navigate out key. + * Backs out one level of a navigation hierarchy or collapses the item that currently has + * focus. */ + public static final int KEYCODE_NAVIGATE_OUT = 263; + + private static final int LAST_KEYCODE = KEYCODE_NAVIGATE_OUT; // 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 b8825b6..ef438ab 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1783,6 +1783,10 @@ <enum name="KEYCODE_TV_MEDIA_CONTEXT_MENU" value="257" /> <enum name="KEYCODE_TV_TIMER_PROGRAMMING" value="258" /> <enum name="KEYCODE_HELP" value="259" /> + <enum name="KEYCODE_NAVIGATE_PREVIOUS" value="260" /> + <enum name="KEYCODE_NAVIGATE_NEXT" value="261" /> + <enum name="KEYCODE_NAVIGATE_IN" value="262" /> + <enum name="KEYCODE_NAVIGATE_OUT" value="263" /> </attr> <!-- ***************************************************************** --> |