Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '26fa501dd6bf906344dd6ba3ff4d110b735a3547':
  DO NOT MERGE: Introduce stem keycodes for Wear
This commit is contained in:
Anthony Hugh
2015-07-15 20:55:13 +00:00
committed by Android Git Automerger
parent 9e393c8637 26fa501dd6
commit 773f1b2f91
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/view/KeyEvent.java
View File

@@ -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;
/** 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()

4
core/res/res/values/attrs.xml
View File

@@ -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>
<!-- ***************************************************************** -->