commit 66cba90940e4bfa32171523bd4e55f2036a54962
author Anthony Hugh <ahugh@google.com> Wed Jul 15 21:08:39 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 15 21:08:39 2015 +0000
tree ffa3bc054f667b534add792bad0c28b54bd66ae8
parent 348105226dd68536257a8d02cd34ce9d0541acdb
parent 773f1b2f919bb4c1f2724eabe8480b6589d8c498

am 773f1b2f: am 26fa501d: DO NOT MERGE: Introduce stem keycodes for Wear

* commit '773f1b2f919bb4c1f2724eabe8480b6589d8c498':
  DO NOT MERGE: Introduce stem keycodes for Wear

core/java/android/view/KeyEvent.java

diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index f6ce353..678a669 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -761,8 +761,21 @@
      * Backs out one level of a navigation hierarchy or collapses the item that currently has 
      * focus. */
     public static final int KEYCODE_NAVIGATE_OUT    = 263;
+    /** 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_NAVIGATE_OUT;
+    private static final int LAST_KEYCODE = KEYCODE_STEM_3;
 
     // NOTE: If you add a new keycode here you must also add it to:
     //  isSystem()

core/res/res/values/attrs.xml

diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index b1925ba..712272f 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -1806,6 +1806,10 @@
         <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>
 
     <!-- ***************************************************************** -->