DO NOT MERGE: Introduce stem keycodes for Wear

Cherry-pick from master

This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2

diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index f6ce353..678a669 100644 (file)
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -761,8 +761,21 @@ public class KeyEvent extends InputEvent implements Parcelable {
      * 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;
+    /** Key code constant: Primary stem key for Wear
+     * Main power/reset button on watch.
+     * @hide */
+    public static final int KEYCODE_STEM_PRIMARY = 264;
+    /** Key code constant: Generic stem key 1 for Wear
+     * @hide */
+    public static final int KEYCODE_STEM_1 = 265;
+    /** Key code constant: Generic stem key 2 for Wear
+     * @hide */
+    public static final int KEYCODE_STEM_2 = 266;
+    /** Key code constant: Generic stem key 3 for Wear
+     * @hide */
+    public static final int KEYCODE_STEM_3 = 267;
+
+    private static final int LAST_KEYCODE = KEYCODE_STEM_3;
 
     // 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 b1925ba..712272f 100644 (file)
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -1806,6 +1806,10 @@ i
         <enum name="KEYCODE_NAVIGATE_NEXT" value="261" />
         <enum name="KEYCODE_NAVIGATE_IN" value="262" />
         <enum name="KEYCODE_NAVIGATE_OUT" value="263" />
+        <enum name="KEYCODE_STEM_PRIMARY" value="264" />
+        <enum name="KEYCODE_STEM_1" value="265" />
+        <enum name="KEYCODE_STEM_2" value="266" />
+        <enum name="KEYCODE_STEM_3" value="267" />
     </attr>
 
     <!-- ***************************************************************** -->