Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de062e47 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Finalize resource IDs; script to help in future. 

Bug: 171506470
Test: Build
Change-Id: I7b7360475ff0f6f4d4c8b8872eefc4e80fd9640e
parent 7c5f4337

core/api/current.txt

+116 −117

File changed.

Preview size limit exceeded, changes collapsed.

core/api/removed.txt

+0 −8
Original line number Diff line number Diff line 
// Signature format: 2.0

package android {



  public static final class R.dimen {

    field public static final int __removed_system_app_widget_internal_padding;

  }



}



package android.app {



  public class Notification implements android.os.Parcelable {

core/api/system-current.txt

+21 −21
Original line number Diff line number Diff line
@@ -317,10 +317,10 @@ package android { 














  public static final class R.attr {















    field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600













    field public static final int hotwordDetectionService;













    field public static final int hotwordDetectionService = 16844326; // 0x1010626















    field public static final int isVrOnly = 16844152; // 0x1010578















    field public static final int minExtensionVersion = 16844305; // 0x1010611













    field public static final int playHomeTransitionSound;













    field public static final int playHomeTransitionSound = 16844358; // 0x1010646















    field public static final int requiredSystemPropertyName = 16844133; // 0x1010565















    field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566















    field public static final int sdkVersion = 16844304; // 0x1010610










@@ -353,8 +353,8 @@ package android {













  }





























  public static final class R.string {













    field public static final int config_customMediaKeyDispatcher;













    field public static final int config_customMediaSessionPolicyProvider;













    field public static final int config_customMediaKeyDispatcher = 17039404; // 0x104002c













    field public static final int config_customMediaSessionPolicyProvider = 17039405; // 0x104002d















    field public static final int config_defaultAssistant = 17039393; // 0x1040021















    field public static final int config_defaultBrowser = 17039394; // 0x1040022















    field public static final int config_defaultCallRedirection = 17039397; // 0x1040025









@@ -367,24 +367,24 @@ package android {













    field public static final int config_helpIntentNameKey = 17039390; // 0x104001e















    field public static final int config_helpPackageNameKey = 17039387; // 0x104001b















    field public static final int config_helpPackageNameValue = 17039388; // 0x104001c













    field public static final int config_systemActivityRecognizer;













    field public static final int config_systemAmbientAudioIntelligence;













    field public static final int config_systemAudioIntelligence;













    field public static final int config_systemAutomotiveCluster;













    field public static final int config_systemAutomotiveProjection;













    field public static final int config_systemCompanionDeviceProvider;













    field public static final int config_systemContacts;













    field public static final int config_systemActivityRecognizer = 17039416; // 0x1040038













    field public static final int config_systemAmbientAudioIntelligence = 17039411; // 0x1040033













    field public static final int config_systemAudioIntelligence = 17039412; // 0x1040034













    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028













    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029













    field public static final int config_systemCompanionDeviceProvider = 17039417; // 0x1040039













    field public static final int config_systemContacts = 17039403; // 0x104002b















    field public static final int config_systemGallery = 17039399; // 0x1040027













    field public static final int config_systemNotificationIntelligence;













    field public static final int config_systemShell;













    field public static final int config_systemSpeechRecognizer;













    field public static final int config_systemTelevisionNotificationHandler;













    field public static final int config_systemTextIntelligence;













    field public static final int config_systemUi;













    field public static final int config_systemUiIntelligence;













    field public static final int config_systemVisualIntelligence;













    field public static final int config_systemWellbeing;













    field public static final int config_systemWifiCoexManager;













    field public static final int config_systemNotificationIntelligence = 17039413; // 0x1040035













    field public static final int config_systemShell = 17039402; // 0x104002a













    field public static final int config_systemSpeechRecognizer = 17039406; // 0x104002e













    field public static final int config_systemTelevisionNotificationHandler = 17039409; // 0x1040031













    field public static final int config_systemTextIntelligence = 17039414; // 0x1040036













    field public static final int config_systemUi = 17039418; // 0x104003a













    field public static final int config_systemUiIntelligence = 17039410; // 0x1040032













    field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037













    field public static final int config_systemWellbeing = 17039408; // 0x1040030













    field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f















  }





























  public static final class R.style {

























core/api/test-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -51,7 +51,7 @@ package android {













  }































  public static final class R.attr {













    field public static final int requestForegroundServiceExemption;













    field public static final int requestForegroundServiceExemption = 16844362; // 0x101064a















  }































  public static final class R.bool {









@@ -63,8 +63,8 @@ package android {













  public static final class R.string {















    field public static final int config_defaultAssistant = 17039393; // 0x1040021















    field public static final int config_defaultDialer = 17039395; // 0x1040023













    field public static final int config_systemAutomotiveCluster;













    field public static final int config_systemAutomotiveProjection;













    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028













    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029















    field public static final int config_systemGallery = 17039399; // 0x1040027















  }

















































core/res/res/values/public.xml



+146
−190




























Original line number
Diff line number
Diff line








@@ -3027,222 +3027,178 @@













    <public type="bool" name="config_assistantOnTopOfDream" id="0x01110005" />















    <!-- @hide @TestApi -->















    <public type="bool" name="config_remoteInsetsControllerControlsSystemBars" id="0x01110006" />





























    <!-- ===============================================================















     Resources added in version S of the platform



























     NOTE: add <public> elements within a <staging-public-group> like so:



























     <staging-public-group type="attr" first-id="0x01010531">













         <public name="exampleAttr1" />













         <public name="exampleAttr2" />













     </staging-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 />





























  <staging-public-group type="attr" first-id="0x01010617">













    <public name="rollbackDataPolicy" />













    <public name="allowClickWhenDisabled" />













    <public name="windowLayoutAffinity" />













    <public name="canPauseRecording" />













    <public name="windowBlurBehindRadius"/>













    <public name="windowBlurBehindEnabled"/>













    <public name="requireDeviceScreenOn" />













    <public name="pathSuffix" />













    <public name="sspSuffix" />













    <public name="pathAdvancedPattern" />













    <public name="sspAdvancedPattern" />













    <public name="fontProviderSystemFontFamily" />













    <public name="hand_second" />













    <public name="memtagMode" />













    <public name="nativeHeapZeroInitialized" />













    <public type="attr" name="rollbackDataPolicy" id="0x01010617" />













    <public type="attr" name="allowClickWhenDisabled" id="0x01010618" />













    <public type="attr" name="windowLayoutAffinity" id="0x01010619" />













    <public type="attr" name="canPauseRecording" id="0x0101061a" />













    <public type="attr" name="windowBlurBehindRadius" id="0x0101061b" />













    <public type="attr" name="windowBlurBehindEnabled" id="0x0101061c" />













    <public type="attr" name="requireDeviceScreenOn" id="0x0101061d" />













    <public type="attr" name="pathSuffix" id="0x0101061e" />













    <public type="attr" name="sspSuffix" id="0x0101061f" />













    <public type="attr" name="pathAdvancedPattern" id="0x01010620" />













    <public type="attr" name="sspAdvancedPattern" id="0x01010621" />













    <public type="attr" name="fontProviderSystemFontFamily" id="0x01010622" />













    <public type="attr" name="hand_second" id="0x01010623" />













    <public type="attr" name="memtagMode" id="0x01010624" />













    <public type="attr" name="nativeHeapZeroInitialized" id="0x01010625" />















    <!-- @hide @SystemApi -->













    <public name="hotwordDetectionService" />













    <public name="previewLayout" />













    <public name="clipToOutline" />













    <public name="__removed3" />













    <public name="knownCerts" />













    <public name="windowBackgroundBlurRadius"/>













    <public name="windowSplashScreenBackground"/>













    <public name="windowSplashScreenAnimatedIcon"/>













    <public name="windowSplashScreenAnimationDuration"/>













    <public name="windowSplashScreenBrandingImage"/>













    <public name="windowSplashScreenIconBackgroundColor"/>













    <public name="splashScreenTheme" />













    <public name="maxResizeWidth" />













    <public name="maxResizeHeight" />













    <public name="targetCellWidth" />













    <public name="targetCellHeight" />













    <public name="dialTint"/>













    <public name="dialTintMode"/>













    <public name="hand_hourTint"/>













    <public name="hand_hourTintMode"/>













    <public name="hand_minuteTint"/>













    <public name="hand_minuteTintMode"/>













    <public name="hand_secondTint"/>













    <public name="hand_secondTintMode"/>













    <public name="dataExtractionRules"/>













    <public name="passwordsActivity"/>













    <public name="selectableAsDefault"/>













    <public name="isAccessibilityTool"/>













    <public name="attributionTags"/>













    <public name="suppressesSpellChecker" />













    <public name="usesPermissionFlags" />













    <public name="requestRawExternalStorageAccess" />













    <public type="attr" name="hotwordDetectionService" id="0x01010626" />













    <public type="attr" name="previewLayout" id="0x01010627" />













    <public type="attr" name="clipToOutline" id="0x01010628" />













    <!-- <public type="attr" name="__removed3" id="0x01010629" /> -->













    <public type="attr" name="knownCerts" id="0x0101062a" />













    <public type="attr" name="windowBackgroundBlurRadius" id="0x0101062b" />













    <public type="attr" name="windowSplashScreenBackground" id="0x0101062c" />













    <public type="attr" name="windowSplashScreenAnimatedIcon" id="0x0101062d" />













    <public type="attr" name="windowSplashScreenAnimationDuration" id="0x0101062e" />













    <public type="attr" name="windowSplashScreenBrandingImage" id="0x0101062f" />













    <public type="attr" name="windowSplashScreenIconBackgroundColor" id="0x01010630" />













    <public type="attr" name="splashScreenTheme" id="0x01010631" />













    <public type="attr" name="maxResizeWidth" id="0x01010632" />













    <public type="attr" name="maxResizeHeight" id="0x01010633" />













    <public type="attr" name="targetCellWidth" id="0x01010634" />













    <public type="attr" name="targetCellHeight" id="0x01010635" />













    <public type="attr" name="dialTint" id="0x01010636" />













    <public type="attr" name="dialTintMode" id="0x01010637" />













    <public type="attr" name="hand_hourTint" id="0x01010638" />













    <public type="attr" name="hand_hourTintMode" id="0x01010639" />













    <public type="attr" name="hand_minuteTint" id="0x0101063a" />













    <public type="attr" name="hand_minuteTintMode" id="0x0101063b" />













    <public type="attr" name="hand_secondTint" id="0x0101063c" />













    <public type="attr" name="hand_secondTintMode" id="0x0101063d" />













    <public type="attr" name="dataExtractionRules" id="0x0101063e" />













    <public type="attr" name="passwordsActivity" id="0x0101063f" />













    <public type="attr" name="selectableAsDefault" id="0x01010640" />













    <public type="attr" name="isAccessibilityTool" id="0x01010641" />













    <public type="attr" name="attributionTags" id="0x01010642" />













    <public type="attr" name="suppressesSpellChecker" id="0x01010643" />













    <public type="attr" name="usesPermissionFlags" id="0x01010644" />













    <public type="attr" name="requestRawExternalStorageAccess" id="0x01010645" />















    <!-- @hide @SystemApi -->













    <public name="playHomeTransitionSound" />













    <public name="lStar" />













    <public name="showInInputMethodPicker" />













    <public name="effectColor" />













    <public type="attr" name="playHomeTransitionSound" id="0x01010646" />













    <public type="attr" name="lStar" id="0x01010647" />













    <public type="attr" name="showInInputMethodPicker" id="0x01010648" />













    <public type="attr" name="effectColor" id="0x01010649" />















    <!-- @hide @TestApi -->













    <public name="requestForegroundServiceExemption" />













    <public name="attributionsAreUserVisible" />













  </staging-public-group>



























  <staging-public-group type="drawable" first-id="0x010800b5">













    <!-- drawable definitions go here -->













  </staging-public-group>



























  <staging-public-group type="color" first-id="0x0106001d">













    <!-- color definitions go here -->



























    <!-- Material design dynamic system palette:-->













    <!-- Neutral colors for background and text -->













    <public name="system_neutral1_0" />













    <public name="system_neutral1_10" />













    <public name="system_neutral1_50" />













    <public name="system_neutral1_100" />













    <public name="system_neutral1_200" />













    <public name="system_neutral1_300" />













    <public name="system_neutral1_400" />













    <public name="system_neutral1_500" />













    <public name="system_neutral1_600" />













    <public name="system_neutral1_700" />













    <public name="system_neutral1_800" />













    <public name="system_neutral1_900" />













    <public name="system_neutral1_1000" />













    <public name="system_neutral2_0" />













    <public name="system_neutral2_10" />













    <public name="system_neutral2_50" />













    <public name="system_neutral2_100" />













    <public name="system_neutral2_200" />













    <public name="system_neutral2_300" />













    <public name="system_neutral2_400" />













    <public name="system_neutral2_500" />













    <public name="system_neutral2_600" />













    <public name="system_neutral2_700" />













    <public name="system_neutral2_800" />













    <public name="system_neutral2_900" />













    <public name="system_neutral2_1000" />













    <!-- Accent colors, for buttons and UI decorations -->













    <public name="system_accent1_0" />













    <public name="system_accent1_10" />













    <public name="system_accent1_50" />













    <public name="system_accent1_100" />













    <public name="system_accent1_200" />













    <public name="system_accent1_300" />













    <public name="system_accent1_400" />













    <public name="system_accent1_500" />













    <public name="system_accent1_600" />













    <public name="system_accent1_700" />













    <public name="system_accent1_800" />













    <public name="system_accent1_900" />













    <public name="system_accent1_1000" />













    <public name="system_accent2_0" />













    <public name="system_accent2_10" />













    <public name="system_accent2_50" />













    <public name="system_accent2_100" />













    <public name="system_accent2_200" />













    <public name="system_accent2_300" />













    <public name="system_accent2_400" />













    <public name="system_accent2_500" />













    <public name="system_accent2_600" />













    <public name="system_accent2_700" />













    <public name="system_accent2_800" />













    <public name="system_accent2_900" />













    <public name="system_accent2_1000" />













    <public name="system_accent3_0" />













    <public name="system_accent3_10" />













    <public name="system_accent3_50" />













    <public name="system_accent3_100" />













    <public name="system_accent3_200" />













    <public name="system_accent3_300" />













    <public name="system_accent3_400" />













    <public name="system_accent3_500" />













    <public name="system_accent3_600" />













    <public name="system_accent3_700" />













    <public name="system_accent3_800" />













    <public name="system_accent3_900" />













    <public name="system_accent3_1000" />













  </staging-public-group>



























  <staging-public-group type="dimen" first-id="0x01050008">













    <!-- dimension definitions go here -->



























    <!-- System-provided dimensions for app widgets. -->













    <public name="system_app_widget_background_radius" />













    <public name="system_app_widget_inner_radius" />













    <public name="__removed_system_app_widget_internal_padding" />













  </staging-public-group>



























  <staging-public-group type="bool" first-id="0x01110007">













    <!-- boolean definitions go here -->













  </staging-public-group>



























  <staging-public-group type="style" first-id="0x010302e5">













    <!-- style definitions go here -->













  </staging-public-group>



























  <staging-public-group type="string" first-id="0x01040028">













    <public type="attr" name="requestForegroundServiceExemption" id="0x0101064a" />













    <public type="attr" name="attributionsAreUserVisible" id="0x0101064b" />



























    <public type="color" name="system_neutral1_0" id="0x0106001d" />













    <public type="color" name="system_neutral1_10" id="0x0106001e" />













    <public type="color" name="system_neutral1_50" id="0x0106001f" />













    <public type="color" name="system_neutral1_100" id="0x01060020" />













    <public type="color" name="system_neutral1_200" id="0x01060021" />













    <public type="color" name="system_neutral1_300" id="0x01060022" />













    <public type="color" name="system_neutral1_400" id="0x01060023" />













    <public type="color" name="system_neutral1_500" id="0x01060024" />













    <public type="color" name="system_neutral1_600" id="0x01060025" />













    <public type="color" name="system_neutral1_700" id="0x01060026" />













    <public type="color" name="system_neutral1_800" id="0x01060027" />













    <public type="color" name="system_neutral1_900" id="0x01060028" />













    <public type="color" name="system_neutral1_1000" id="0x01060029" />













    <public type="color" name="system_neutral2_0" id="0x0106002a" />













    <public type="color" name="system_neutral2_10" id="0x0106002b" />













    <public type="color" name="system_neutral2_50" id="0x0106002c" />













    <public type="color" name="system_neutral2_100" id="0x0106002d" />













    <public type="color" name="system_neutral2_200" id="0x0106002e" />













    <public type="color" name="system_neutral2_300" id="0x0106002f" />













    <public type="color" name="system_neutral2_400" id="0x01060030" />













    <public type="color" name="system_neutral2_500" id="0x01060031" />













    <public type="color" name="system_neutral2_600" id="0x01060032" />













    <public type="color" name="system_neutral2_700" id="0x01060033" />













    <public type="color" name="system_neutral2_800" id="0x01060034" />













    <public type="color" name="system_neutral2_900" id="0x01060035" />













    <public type="color" name="system_neutral2_1000" id="0x01060036" />













    <public type="color" name="system_accent1_0" id="0x01060037" />













    <public type="color" name="system_accent1_10" id="0x01060038" />













    <public type="color" name="system_accent1_50" id="0x01060039" />













    <public type="color" name="system_accent1_100" id="0x0106003a" />













    <public type="color" name="system_accent1_200" id="0x0106003b" />













    <public type="color" name="system_accent1_300" id="0x0106003c" />













    <public type="color" name="system_accent1_400" id="0x0106003d" />













    <public type="color" name="system_accent1_500" id="0x0106003e" />













    <public type="color" name="system_accent1_600" id="0x0106003f" />













    <public type="color" name="system_accent1_700" id="0x01060040" />













    <public type="color" name="system_accent1_800" id="0x01060041" />













    <public type="color" name="system_accent1_900" id="0x01060042" />













    <public type="color" name="system_accent1_1000" id="0x01060043" />













    <public type="color" name="system_accent2_0" id="0x01060044" />













    <public type="color" name="system_accent2_10" id="0x01060045" />













    <public type="color" name="system_accent2_50" id="0x01060046" />













    <public type="color" name="system_accent2_100" id="0x01060047" />













    <public type="color" name="system_accent2_200" id="0x01060048" />













    <public type="color" name="system_accent2_300" id="0x01060049" />













    <public type="color" name="system_accent2_400" id="0x0106004a" />













    <public type="color" name="system_accent2_500" id="0x0106004b" />













    <public type="color" name="system_accent2_600" id="0x0106004c" />













    <public type="color" name="system_accent2_700" id="0x0106004d" />













    <public type="color" name="system_accent2_800" id="0x0106004e" />













    <public type="color" name="system_accent2_900" id="0x0106004f" />













    <public type="color" name="system_accent2_1000" id="0x01060050" />













    <public type="color" name="system_accent3_0" id="0x01060051" />













    <public type="color" name="system_accent3_10" id="0x01060052" />













    <public type="color" name="system_accent3_50" id="0x01060053" />













    <public type="color" name="system_accent3_100" id="0x01060054" />













    <public type="color" name="system_accent3_200" id="0x01060055" />













    <public type="color" name="system_accent3_300" id="0x01060056" />













    <public type="color" name="system_accent3_400" id="0x01060057" />













    <public type="color" name="system_accent3_500" id="0x01060058" />













    <public type="color" name="system_accent3_600" id="0x01060059" />













    <public type="color" name="system_accent3_700" id="0x0106005a" />













    <public type="color" name="system_accent3_800" id="0x0106005b" />













    <public type="color" name="system_accent3_900" id="0x0106005c" />













    <public type="color" name="system_accent3_1000" id="0x0106005d" />



























    <public type="dimen" name="system_app_widget_background_radius" id="0x01050008" />













    <public type="dimen" name="system_app_widget_inner_radius" id="0x01050009" />





























    <!-- @hide @SystemApi @TestApi -->













    <public name="config_systemAutomotiveCluster" />













    <public type="string" name="config_systemAutomotiveCluster" id="0x01040028" />















    <!-- @hide @SystemApi @TestApi -->













    <public name="config_systemAutomotiveProjection" />













    <public type="string" name="config_systemAutomotiveProjection" id="0x01040029" />















    <!-- @hide @SystemApi -->













    <public name="config_systemShell" />













    <public type="string" name="config_systemShell" id="0x0104002a" />















    <!-- @hide @SystemApi -->













    <public name="config_systemContacts" />













    <public type="string" name="config_systemContacts" id="0x0104002b" />















    <!-- @hide @SystemApi -->













    <public name="config_customMediaKeyDispatcher" />













    <public type="string" name="config_customMediaKeyDispatcher" id="0x0104002c" />















    <!-- @hide @SystemApi -->













    <public name="config_customMediaSessionPolicyProvider" />













    <public type="string" name="config_customMediaSessionPolicyProvider" id="0x0104002d" />















    <!-- @hide @SystemApi -->













    <public name="config_systemSpeechRecognizer" />













    <public type="string" name="config_systemSpeechRecognizer" id="0x0104002e" />















    <!-- @hide @SystemApi -->













    <public name="config_systemWifiCoexManager" />













    <public type="string" name="config_systemWifiCoexManager" id="0x0104002f" />















    <!-- @hide @SystemApi -->













    <public name="config_systemWellbeing" />













    <public type="string" name="config_systemWellbeing" id="0x01040030" />















    <!-- @hide @SystemApi -->













    <public name="config_systemTelevisionNotificationHandler" />













    <public type="string" name="config_systemTelevisionNotificationHandler" id="0x01040031" />















    <!-- @hide @SystemApi -->













    <public name="config_systemUiIntelligence" />













    <public type="string" name="config_systemUiIntelligence" id="0x01040032" />















    <!-- @hide @SystemApi -->













    <public name="config_systemAmbientAudioIntelligence" />













    <public type="string" name="config_systemAmbientAudioIntelligence" id="0x01040033" />















    <!-- @hide @SystemApi -->













    <public name="config_systemAudioIntelligence" />













    <public type="string" name="config_systemAudioIntelligence" id="0x01040034" />















    <!-- @hide @SystemApi -->













    <public name="config_systemNotificationIntelligence" />













    <public type="string" name="config_systemNotificationIntelligence" id="0x01040035" />















    <!-- @hide @SystemApi -->













    <public name="config_systemTextIntelligence" />













    <public type="string" name="config_systemTextIntelligence" id="0x01040036" />















    <!-- @hide @SystemApi -->













    <public name="config_systemVisualIntelligence" />













    <public type="string" name="config_systemVisualIntelligence" id="0x01040037" />















    <!-- @hide @SystemApi -->













    <public name="config_systemActivityRecognizer" />













    <public type="string" name="config_systemActivityRecognizer" id="0x01040038" />















    <!-- @hide @SystemApi -->













    <public name="config_systemCompanionDeviceProvider"/>













    <public type="string" name="config_systemCompanionDeviceProvider" id="0x01040039" />















    <!-- @hide @SystemApi -->













    <public name="config_systemUi" />













    <public type="string" name="config_systemUi" id="0x0104003a" />















    <!-- @hide For use by platform and tools only. Developers should not specify this value. -->













    <public name="config_defaultRingtoneVibrationSound"/>













  </staging-public-group>



























  <staging-public-group type="id" first-id="0x01020055">













    <!-- id definitions go here -->













  </staging-public-group>













    <public type="string" name="config_defaultRingtoneVibrationSound" id="0x0104003b" />































  <!-- ===============================================================















       DO NOT ADD UN-GROUPED ITEMS HERE