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

Merge \"N MR1 is API 25\" into nyc-mr1-dev

Browse Source 
am: c9099d1a84

Change-Id: I959b38c391e0ab5fa00c2389c85c2a1aa07dcf61
This commit is contained in:
Michael Wright
2016-07-01 15:40:50 +00:00
committed by android-build-merger
parent 09daa02022 c9099d1a84
commit 92b73c654b
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -28371,6 +28371,7 @@ package android.os {
field public static final int LOLLIPOP_MR1 = 22; // 0x16
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

1
api/system-current.txt
View File

@@ -30851,6 +30851,7 @@ package android.os {
field public static final int LOLLIPOP_MR1 = 22; // 0x16
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

1
api/test-current.txt
View File

@@ -28441,6 +28441,7 @@ package android.os {
field public static final int LOLLIPOP_MR1 = 22; // 0x16
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

5
core/java/android/os/Build.java
View File

@@ -672,6 +672,11 @@ public class Build {
* N is for ¯\_(ツ)_/¯.
*/
public static final int N = 24;
/**
* N MR1: Still ¯\_(シ)_/¯.
*/
public static final int N_MR1 = 25;
}
/** The type of build, like "user" or "eng". */

19
core/res/res/values/public.xml
View File

@@ -2732,15 +2732,14 @@
Resources added in version N MR1 of the platform
=============================================================== -->
<eat-comment />
<public type="attr" name="shortcutId" />
<public type="attr" name="shortcutShortLabel" />
<public type="attr" name="shortcutLongLabel" />
<public type="attr" name="shortcutDisabledMessage" />
<public type="attr" name="roundIcon" />
<public type="attr" name="contextUri" />
<public type="attr" name="contextDescription" />
<public type="attr" name="showMetadataInPreview" />
<public type="attr" name="colorSecondary" />
<public type="attr" name="shortcutId" id="0x01010528" />
<public type="attr" name="shortcutShortLabel" id="0x01010529" />
<public type="attr" name="shortcutLongLabel" id="0x0101052a" />
<public type="attr" name="shortcutDisabledMessage" id="0x0101052b" />
<public type="attr" name="roundIcon" id="0x0101052c" />
<public type="attr" name="contextUri" id="0x0101052d" />
<public type="attr" name="contextDescription" id="0x0101052e" />
<public type="attr" name="showMetadataInPreview" id="0x0101052f" />
<public type="attr" name="colorSecondary" id="0x01010530" />
</resources>