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

Merge commit '9dd2663d' into mm

Browse Source 
Change-Id: Idf37dbc3bba970817e6620fe0129e54e86f553d5
This commit is contained in:
Michael Wright
2015-08-07 19:13:34 +01:00
parent 1f51460887 9dd2663db4
commit 97e7762782
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -35140,6 +35140,10 @@ package android.view {
field public static final int KEYCODE_MEDIA_PREVIOUS = 88; // 0x58 field public static final int KEYCODE_MEDIA_PREVIOUS = 88; // 0x58
field public static final int KEYCODE_MEDIA_RECORD = 130; // 0x82 field public static final int KEYCODE_MEDIA_RECORD = 130; // 0x82
field public static final int KEYCODE_MEDIA_REWIND = 89; // 0x59 field public static final int KEYCODE_MEDIA_REWIND = 89; // 0x59
field public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273; // 0x111
field public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272; // 0x110
field public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; // 0x113
field public static final int KEYCODE_MEDIA_STEP_FORWARD = 274; // 0x112
field public static final int KEYCODE_MEDIA_STOP = 86; // 0x56 field public static final int KEYCODE_MEDIA_STOP = 86; // 0x56
field public static final int KEYCODE_MEDIA_TOP_MENU = 226; // 0xe2 field public static final int KEYCODE_MEDIA_TOP_MENU = 226; // 0xe2
field public static final int KEYCODE_MENU = 82; // 0x52 field public static final int KEYCODE_MENU = 82; // 0x52

4
api/system-current.txt
View File

@@ -37432,6 +37432,10 @@ package android.view {
field public static final int KEYCODE_MEDIA_PREVIOUS = 88; // 0x58 field public static final int KEYCODE_MEDIA_PREVIOUS = 88; // 0x58
field public static final int KEYCODE_MEDIA_RECORD = 130; // 0x82 field public static final int KEYCODE_MEDIA_RECORD = 130; // 0x82
field public static final int KEYCODE_MEDIA_REWIND = 89; // 0x59 field public static final int KEYCODE_MEDIA_REWIND = 89; // 0x59
field public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273; // 0x111
field public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272; // 0x110
field public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; // 0x113
field public static final int KEYCODE_MEDIA_STEP_FORWARD = 274; // 0x112
field public static final int KEYCODE_MEDIA_STOP = 86; // 0x56 field public static final int KEYCODE_MEDIA_STOP = 86; // 0x56
field public static final int KEYCODE_MEDIA_TOP_MENU = 226; // 0xe2 field public static final int KEYCODE_MEDIA_TOP_MENU = 226; // 0xe2
field public static final int KEYCODE_MENU = 82; // 0x52 field public static final int KEYCODE_MENU = 82; // 0x52

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

@@ -774,8 +774,18 @@ public class KeyEvent extends InputEvent implements Parcelable {
/** Key code constant: Generic stem key 3 for Wear /** Key code constant: Generic stem key 3 for Wear
* @hide */ * @hide */
public static final int KEYCODE_STEM_3 = 267; public static final int KEYCODE_STEM_3 = 267;
/** Key code constant: Skip forward media key. */
public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272;
/** Key code constant: Skip backward media key. */
public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273;
/** Key code constant: Step forward media key.
* Steps media forward, one frame at a time. */
public static final int KEYCODE_MEDIA_STEP_FORWARD = 274;
/** Key code constant: Step backward media key.
* Steps media backward, one frame at a time. */
public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275;
private static final int LAST_KEYCODE = KEYCODE_STEM_3; private static final int LAST_KEYCODE = KEYCODE_MEDIA_STEP_BACKWARD;
// 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

@@ -1810,6 +1810,10 @@ i
<enum name="KEYCODE_STEM_1" value="265" /> <enum name="KEYCODE_STEM_1" value="265" />
<enum name="KEYCODE_STEM_2" value="266" /> <enum name="KEYCODE_STEM_2" value="266" />
<enum name="KEYCODE_STEM_3" value="267" /> <enum name="KEYCODE_STEM_3" value="267" />
<enum name="KEYCODE_MEDIA_SKIP_FORWARD" value="272" />
<enum name="KEYCODE_MEDIA_SKIP_BACKWARD" value="273" />
<enum name="KEYCODE_MEDIA_STEP_FORWARD" value="274" />
<enum name="KEYCODE_MEDIA_STEP_BACKWARD" value="275" />
</attr> </attr>
<!-- ***************************************************************** --> <!-- ***************************************************************** -->