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

Merge changes from topic "bumping-api" into pi-dev

Browse Source 
* changes:
  Finalizing P SDK
  Finalizing P SDK
This commit is contained in:
Wale Ogunwale
2018-04-13 20:53:03 +00:00
committed by Android (Google) Code Review
parent a991071db9 456c8cd2d4
commit 51c1904b95
5 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -32190,7 +32190,7 @@ package android.os {
field public static final int N_MR1 = 25; // 0x19 field public static final int N_MR1 = 25; // 0x19
field public static final int O = 26; // 0x1a field public static final int O = 26; // 0x1a
field public static final int O_MR1 = 27; // 0x1b field public static final int O_MR1 = 27; // 0x1b
field public static final int P = 10000; // 0x2710 field public static final int P = 28; // 0x1c
} }
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

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

@@ -911,7 +911,7 @@ public class Build {
* even if there is no excess space.</li> * even if there is no excess space.</li>
* </ul> * </ul>
*/ */
public static final int P = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version. public static final int P = 28;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */

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

@@ -2841,71 +2841,79 @@
<public type="string" name="autofill" id="0x0104001a"/> <public type="string" name="autofill" id="0x0104001a"/>
<!-- =============================================================== <!-- ===============================================================
Resources added in version P of the platform Resources added in version P of the platform
=============================================================== -->
NOTE: add <public> elements within a <public-group> like so:
<public-group type="attr" first-id="0x01010531">
<public name="exampleAttr1" />
<public name="exampleAttr2" />
</public-group>
To add a new public-group block, choose an id value that is 1 greater
than the last of that item above. For example, the last "attr" id
value above is 0x01010530, so the public-group of attrs below has
the id value of 0x01010531.
=============================================================== -->
<eat-comment /> <eat-comment />
<public-group type="attr" first-id="0x0101056e"> <public type="attr" name="cantSaveState" id="0x0101056e" />
<public name="cantSaveState" /> <public type="attr" name="ttcIndex" id="0x0101056f" />
<public name="ttcIndex" /> <public type="attr" name="fontVariationSettings" id="0x01010570" />
<public name="fontVariationSettings" /> <public type="attr" name="dialogCornerRadius" id="0x01010571" />
<public name="dialogCornerRadius" /> <!-- @hide For use by platform and tools only. Developers should not specify this value. -->
<!-- @hide For use by platform and tools only. Developers should not specify this value. --> <public type="attr" name="compileSdkVersion" id="0x01010572" />
<public name="compileSdkVersion" /> <!-- @hide For use by platform and tools only. Developers should not specify this value. -->
<!-- @hide For use by platform and tools only. Developers should not specify this value. --> <public type="attr" name="compileSdkVersionCodename" id="0x01010573" />
<public name="compileSdkVersionCodename" /> <public type="attr" name="screenReaderFocusable" id="0x01010574" />
<public name="screenReaderFocusable" /> <public type="attr" name="buttonCornerRadius" id="0x01010575" />
<public name="buttonCornerRadius" /> <public type="attr" name="versionCodeMajor" id="0x01010576" />
<public name="versionCodeMajor" /> <public type="attr" name="versionMajor" id="0x01010577" />
<public name="versionMajor" /> <!-- @hide @SystemApi -->
<!-- @hide @SystemApi --> <public type="attr" name="isVrOnly" id="0x01010578" />
<public name="isVrOnly"/> <public type="attr" name="widgetFeatures" id="0x01010579" />
<public name="widgetFeatures" /> <public type="attr" name="appComponentFactory" id="0x0101057a" />
<public name="appComponentFactory" /> <public type="attr" name="fallbackLineSpacing" id="0x0101057b" />
<public name="fallbackLineSpacing" /> <public type="attr" name="accessibilityPaneTitle" id="0x0101057c" />
<public name="accessibilityPaneTitle" /> <public type="attr" name="firstBaselineToTopHeight" id="0x0101057d" />
<public name="firstBaselineToTopHeight" /> <public type="attr" name="lastBaselineToBottomHeight" id="0x0101057e" />
<public name="lastBaselineToBottomHeight" /> <public type="attr" name="lineHeight" id="0x0101057f" />
<public name="lineHeight" /> <public type="attr" name="accessibilityHeading" id="0x01010580" />
<public name="accessibilityHeading" /> <public type="attr" name="outlineSpotShadowColor" id="0x01010581" />
<public name="outlineSpotShadowColor" /> <public type="attr" name="outlineAmbientShadowColor" id="0x01010582" />
<public name="outlineAmbientShadowColor" /> <public type="attr" name="maxLongVersionCode" id="0x01010583" />
<public name="maxLongVersionCode" /> <!-- @hide @SystemApi -->
<!-- @hide @SystemApi --> <public type="attr" name="userRestriction" id="0x01010584" />
<public name="userRestriction" /> <public type="attr" name="textFontWeight" id="0x01010585" />
<public name="textFontWeight" /> <public type="attr" name="windowLayoutInDisplayCutoutMode" id="0x01010586" />
<public name="windowLayoutInDisplayCutoutMode" />
<public type="style" name="Widget.DeviceDefault.Button.Colored" id="0x010302e0" />
<public type="style" name="Widget.DeviceDefault.Button.Borderless.Colored" id="0x010302e1" />
<public type="id" name="accessibilityActionShowTooltip" id="0x01020044" />
<public type="id" name="accessibilityActionHideTooltip" id="0x01020045" />
<!-- An interpolator which accelerates fast but decelerates extra slowly. -->
<public type="interpolator" name="fast_out_extra_slow_in" id="0x10c001a"/>
<!-- ===============================================================
Resources added in version Q of the platform
NOTE: add <public> elements within a <public-group> like so:
<public-group type="attr" first-id="0x01010531">
<public name="exampleAttr1" />
<public name="exampleAttr2" />
</public-group>
To add a new public-group block, choose an id value that is 1 greater
than the last of that item above. For example, the last "attr" id
value above is 0x01010530, so the public-group of attrs below has
the id value of 0x01010531.
=============================================================== -->
<eat-comment />
<public-group type="attr" first-id="0x01010587">
</public-group> </public-group>
<public-group type="style" first-id="0x010302e0"> <public-group type="style" first-id="0x010302e2">
<public name="Widget.DeviceDefault.Button.Colored" />
<public name="Widget.DeviceDefault.Button.Borderless.Colored" />
</public-group> </public-group>
<public-group type="id" first-id="0x01020044"> <public-group type="id" first-id="0x01020046">
<public name="accessibilityActionShowTooltip" />
<public name="accessibilityActionHideTooltip" />
</public-group> </public-group>
<public-group type="string" first-id="0x0104001b"> <public-group type="string" first-id="0x0104001b">
</public-group> </public-group>
<!-- An interpolator which accelerates fast but decelerates extra slowly. -->
<public type="interpolator" name="fast_out_extra_slow_in" id="0x10c001a"/>
<!-- =============================================================== <!-- ===============================================================
DO NOT ADD UN-GROUPED ITEMS HERE DO NOT ADD UN-GROUPED ITEMS HERE

2
tools/aapt/SdkConstants.h
View File

@@ -43,7 +43,7 @@ enum {
SDK_NOUGAT_MR1 = 25, SDK_NOUGAT_MR1 = 25,
SDK_O = 26, SDK_O = 26,
SDK_O_MR1 = 27, SDK_O_MR1 = 27,
SDK_P = 10000, // STOPSHIP Replace with the real version. SDK_P = 28,
}; };
#endif // H_AAPT_SDK_CONSTANTS #endif // H_AAPT_SDK_CONSTANTS

2
tools/aapt2/SdkConstants.h
View File

@@ -53,7 +53,7 @@ enum : ApiVersion {
SDK_NOUGAT_MR1 = 25, SDK_NOUGAT_MR1 = 25,
SDK_O = 26, SDK_O = 26,
SDK_O_MR1 = 27, SDK_O_MR1 = 27,
SDK_P = 10000, // STOPSHIP Replace with the real version. SDK_P = 28,
}; };
ApiVersion FindAttributeSdkLevel(const ResourceId& id); ApiVersion FindAttributeSdkLevel(const ResourceId& id);