Updating platform SDK version for R
* Finalize resources
* Update appt/aapt2 constants
* Update R and SDK constants
* Fix a crashloop bug
Test: build + boot
bug:150281259
Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 70b2db7..ef2a8a1 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1005,7 +1005,7 @@
/**
* R.
*/
- public static final int R = CUR_DEVELOPMENT;
+ public static final int R = 30;
}
/** The type of build, like "user" or "eng". */
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index fb887c3..2869021 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2979,9 +2979,51 @@
<!-- @hide @SystemApi -->
<public type="color" name="system_notification_accent_color" id="0x0106001c" />
+ <!-- ===============================================================
+ Resources added in version R of the platform
+ =============================================================== -->
+ <eat-comment />
+
+ <public type="attr" name="importantForContentCapture" id="0x01010607" />
+ <public type="attr" name="forceQueryable" id="0x01010608"/>
+ <public type="attr" name="resourcesMap" id="0x01010609"/>
+ <public type="attr" name="animatedImageDrawable" id="0x0101060a"/>
+ <public type="attr" name="htmlDescription" id="0x0101060b"/>
+ <public type="attr" name="preferMinimalPostProcessing" id="0x0101060c"/>
+ <public type="attr" name="supportsInlineSuggestions" id="0x0101060d"/>
+ <public type="attr" name="crossProfile" id="0x0101060e"/>
+ <public type="attr" name="canTakeScreenshot" id="0x0101060f"/>
+ <!-- @hide @SystemApi -->
+ <public type="attr" name="sdkVersion" id="0x01010610" />
+ <!-- @hide @SystemApi -->
+ <public type="attr" name="minExtensionVersion" id="0x01010611" />
+ <public type="attr" name="allowNativeHeapPointerTagging" id="0x01010612" />
+ <public type="attr" name="autoRevokePermissions" id="0x01010613" />
+ <public type="attr" name="preserveLegacyExternalStorage" id="0x01010614" />
+ <public type="attr" name="mimeGroup" id="0x01010615" />
+ <public type="attr" name="gwpAsanMode" id="0x01010616" />
+
+ <!-- @hide @SystemApi -->
+ <public type="string" name="config_defaultCallRedirection" id="0x01040025" />
+ <!-- @hide @SystemApi -->
+ <public type="string" name="config_defaultCallScreening" id="0x01040026" />
+ <!-- @hide @SystemApi @TestApi -->
+ <public type="string" name="config_systemGallery" id="0x01040027" />
+
+ <public type="id" name="accessibilityActionPressAndHold" id="0x0102004a" />
+ <public type="id" name="accessibilitySystemActionBack" id="0x0102004b" />
+ <public type="id" name="accessibilitySystemActionHome" id="0x0102004c" />
+ <public type="id" name="accessibilitySystemActionRecents" id="0x0102004d" />
+ <public type="id" name="accessibilitySystemActionNotifications" id="0x0102004e" />
+ <public type="id" name="accessibilitySystemActionQuickSettings" id="0x0102004f" />
+ <public type="id" name="accessibilitySystemActionPowerDialog" id="0x01020050" />
+ <public type="id" name="accessibilitySystemActionToggleSplitScreen" id="0x01020051" />
+ <public type="id" name="accessibilitySystemActionLockScreen" id="0x01020052" />
+ <public type="id" name="accessibilitySystemActionTakeScreenshot" id="0x01020053" />
+ <public type="id" name="accessibilityActionImeEnter" id="0x01020054" />
<!-- ===============================================================
- Resources added in version R of the platform
+ Resources added in version S of the platform
NOTE: add <public> elements within a <public-group> like so:
@@ -2995,88 +3037,39 @@
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="0x01010607">
- <public name="importantForContentCapture" />
- <public name="forceQueryable" />
- <public name="resourcesMap" />
- <public name="animatedImageDrawable"/>
- <public name="htmlDescription"/>
- <public name="preferMinimalPostProcessing"/>
- <!-- @removed -->
- <public name="featureId" />
- <public name="supportsInlineSuggestions" />
- <public name="crossProfile" />
- <public name="canTakeScreenshot"/>
- <!-- @hide @SystemApi -->
- <public name="sdkVersion" />
- <!-- @hide @SystemApi -->
- <public name="minExtensionVersion" />
- <public name="allowNativeHeapPointerTagging" />
- <!-- @hide no longer used, kept to preserve padding -->
- <public name="allowAutoRevokePermissionsExemption"/>
- <public name="autoRevokePermissions" />
- <public name="preserveLegacyExternalStorage" />
- <public name="mimeGroup" />
- <public name="gwpAsanMode" />
- <!-- @hide -->
- <public name="scrollCaptureHint" />
- </public-group>
+ <public-group type="attr" first-id="0x01010617">
+ <!-- attribute definitions go here -->
+ </public-group>
- <public-group type="drawable" first-id="0x010800b5">
- </public-group>
+ <public-group type="drawable" first-id="0x010800b5">
+ <!-- drawable definitions go here -->
+ </public-group>
- <public-group type="style" first-id="0x010302e5">
- </public-group>
+ <public-group type="color" first-id="0x0106001d">
+ <!-- color definitions go here -->
+ </public-group>
- <public-group type="id" first-id="0x0102004a">
- <public name="accessibilityActionPressAndHold" />
- </public-group>
+ <public-group type="dimen" first-id="0x01050008">
+ <!-- dimension definitions go here -->
+ </public-group>
- <public-group type="string" first-id="0x01040025">
- <!-- @hide -->
- <public name="notification_channel_network_status" />
- <!-- @hide -->
- <public name="notification_channel_network_alerts" />
- <!-- @hide -->
- <public name="notification_channel_network_available" />
- <!-- @hide @SystemApi -->
- <public name="config_defaultCallRedirection" />
- <!-- @hide @SystemApi -->
- <public name="config_defaultCallScreening" />
- <!-- @hide @SystemApi @TestApi -->
- <public name="config_systemGallery" />
- </public-group>
+ <public-group type="bool" first-id="0x01110005">
+ <!-- boolean definitions go here -->
+ </public-group>
- <public-group type="bool" first-id="0x01110005">
- </public-group>
+ <public-group type="style" first-id="0x010302e5">
+ <!-- style definitions go here -->
+ </public-group>
- <public-group type="dimen" first-id="0x01050008">
- </public-group>
+ <public-group type="string" first-id="0x01040028">
+ <!-- string definitions go here -->
+ </public-group>
- <public-group type="color" first-id="0x0106001d">
- </public-group>
+ <public-group type="id" first-id="0x01020055">
+ <!-- id definitions go here -->
+ </public-group>
- <public-group type="id" first-id="0x0102004b">
- <public name="accessibilitySystemActionBack" />
- <public name="accessibilitySystemActionHome" />
- <public name="accessibilitySystemActionRecents" />
- <public name="accessibilitySystemActionNotifications" />
- <public name="accessibilitySystemActionQuickSettings" />
- <public name="accessibilitySystemActionPowerDialog" />
- <public name="accessibilitySystemActionToggleSplitScreen" />
- <public name="accessibilitySystemActionLockScreen" />
- <public name="accessibilitySystemActionTakeScreenshot" />
- <public name="accessibilityActionImeEnter" />
- </public-group>
-
- <public-group type="string" first-id="0x0104002c">
- <!-- @hide -->
- <public name="config_customMediaKeyDispatcher" />
- <!-- @hide -->
- <public name="config_customSessionPolicyProvider" />
- </public-group>
<!-- ===============================================================
DO NOT ADD UN-GROUPED ITEMS HERE
@@ -3085,4 +3078,5 @@
Items added outside of a group may have their value recalculated
every time something new is added to this file.
=============================================================== -->
+
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 53e0bf9..3dc3b0b 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3994,4 +3994,9 @@
<java-symbol type="bool" name="config_assistantOnTopOfDream"/>
<java-symbol type="string" name="config_overrideComponentUiPackage" />
+
+ <java-symbol type="string" name="notification_channel_network_status" />
+ <java-symbol type="string" name="notification_channel_network_alerts" />
+ <java-symbol type="string" name="notification_channel_network_available" />
+
</resources>