drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear

Browse Source 
* commit '001df9ca900f3098222a4920a0048d2eb947bd4e':
  DO NOT MERGE: Introduce stem keycodes for Wear
This commit is contained in:
Anthony Hugh
2015-06-25 01:27:41 +00:00
committed by Android Git Automerger
parent 1ee8470ca3 001df9ca90
commit a50fa71044
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

@ -748,8 +748,21 @@ public class KeyEvent extends InputEvent implements Parcelable {
public static final int KEYCODE_TV_TIMER_PROGRAMMING = 258; public static final int KEYCODE_TV_TIMER_PROGRAMMING = 258;
/** Key code constant: Help key. */ /** Key code constant: Help key. */
public static final int KEYCODE_HELP = 259; public static final int KEYCODE_HELP = 259;
/** 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_HELP; private static final int LAST_KEYCODE = KEYCODE_STEM_3;
// NOTE: If you add a new keycode here you must also add it to: // NOTE: If you add a new keycode here you must also add it to:
// isSystem() // isSystem()

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

@ -1778,6 +1778,10 @@
<enum name="KEYCODE_TV_MEDIA_CONTEXT_MENU" value="257" /> <enum name="KEYCODE_TV_MEDIA_CONTEXT_MENU" value="257" />
<enum name="KEYCODE_TV_TIMER_PROGRAMMING" value="258" /> <enum name="KEYCODE_TV_TIMER_PROGRAMMING" value="258" />
<enum name="KEYCODE_HELP" value="259" /> <enum name="KEYCODE_HELP" value="259" />
<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> </attr>
<!-- ***************************************************************** --> <!-- ***************************************************************** -->