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

Commit 210690bd authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Android (Google) Code Review
Browse files

Merge "Finalized resources for Baklava" into main

parents 1cd7df4b 74191723

core/api/current.txt

+8 −8
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ package android { 
    field public static final int activityCloseExitAnimation = 16842939; // 0x10100bb

    field public static final int activityOpenEnterAnimation = 16842936; // 0x10100b8

    field public static final int activityOpenExitAnimation = 16842937; // 0x10100b9

    field @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public static final int adServiceTypes;

    field @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public static final int adServiceTypes = 16844452; // 0x10106a4

    field public static final int addPrintersActivity = 16843750; // 0x10103e6

    field public static final int addStatesFromChildren = 16842992; // 0x10100f0

    field public static final int adjustViewBounds = 16843038; // 0x101011e
@@ -1017,7 +1017,7 @@ package android { 
    field public static final int insetRight = 16843192; // 0x10101b8

    field public static final int insetTop = 16843193; // 0x10101b9

    field public static final int installLocation = 16843447; // 0x10102b7

    field @FlaggedApi("android.security.enable_intent_matching_flags") public static final int intentMatchingFlags;

    field @FlaggedApi("android.security.enable_intent_matching_flags") public static final int intentMatchingFlags = 16844457; // 0x10106a9

    field public static final int interactiveUiTimeout = 16844181; // 0x1010595

    field public static final int interpolator = 16843073; // 0x1010141

    field public static final int intro = 16844395; // 0x101066b
@@ -1072,7 +1072,7 @@ package android { 
    field public static final int label = 16842753; // 0x1010001

    field public static final int labelFor = 16843718; // 0x10103c6

    field @Deprecated public static final int labelTextSize = 16843317; // 0x1010235

    field @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public static final int languageSettingsActivity;

    field @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public static final int languageSettingsActivity = 16844453; // 0x10106a5

    field public static final int languageTag = 16844040; // 0x1010508

    field public static final int largeHeap = 16843610; // 0x101035a

    field public static final int largeScreens = 16843398; // 0x1010286
@@ -1085,7 +1085,7 @@ package android { 
    field public static final int layout = 16842994; // 0x10100f2

    field public static final int layoutAnimation = 16842988; // 0x10100ec

    field public static final int layoutDirection = 16843698; // 0x10103b2

    field @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public static final int layoutLabel;

    field @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public static final int layoutLabel = 16844458; // 0x10106aa

    field public static final int layoutMode = 16843738; // 0x10103da

    field public static final int layout_above = 16843140; // 0x1010184

    field public static final int layout_alignBaseline = 16843142; // 0x1010186
@@ -1207,7 +1207,7 @@ package android { 
    field public static final int minResizeHeight = 16843670; // 0x1010396

    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int minSdkVersionFull;

    field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int minSdkVersionFull = 16844461; // 0x10106ad

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e
@@ -1282,7 +1282,7 @@ package android { 
    field public static final int paddingStart = 16843699; // 0x10103b3

    field public static final int paddingTop = 16842967; // 0x10100d7

    field public static final int paddingVertical = 16844094; // 0x101053e

    field @FlaggedApi("android.content.pm.app_compat_option_16kb") public static final int pageSizeCompat;

    field @FlaggedApi("android.content.pm.app_compat_option_16kb") public static final int pageSizeCompat = 16844459; // 0x10106ab

    field public static final int panelBackground = 16842846; // 0x101005e

    field public static final int panelColorBackground = 16842849; // 0x1010061

    field public static final int panelColorForeground = 16842848; // 0x1010060
@@ -1624,7 +1624,7 @@ package android { 
    field public static final int summaryColumn = 16843426; // 0x10102a2

    field public static final int summaryOff = 16843248; // 0x10101f0

    field public static final int summaryOn = 16843247; // 0x10101ef

    field @FlaggedApi("android.view.accessibility.supplemental_description") public static final int supplementalDescription;

    field @FlaggedApi("android.view.accessibility.supplemental_description") public static final int supplementalDescription = 16844456; // 0x10106a8

    field public static final int supportedTypes = 16844369; // 0x1010651

    field public static final int supportsAssist = 16844016; // 0x10104f0

    field public static final int supportsBatteryGameMode = 16844374; // 0x1010656
@@ -1871,7 +1871,7 @@ package android { 
    field public static final int wallpaperIntraOpenExitAnimation = 16843416; // 0x1010298

    field public static final int wallpaperOpenEnterAnimation = 16843411; // 0x1010293

    field public static final int wallpaperOpenExitAnimation = 16843412; // 0x1010294

    field @FlaggedApi("android.nfc.nfc_associated_role_services") public static final int wantsRoleHolderPriority;

    field @FlaggedApi("android.nfc.nfc_associated_role_services") public static final int wantsRoleHolderPriority = 16844460; // 0x10106ac

    field public static final int webTextViewStyle = 16843449; // 0x10102b9

    field public static final int webViewStyle = 16842885; // 0x1010085

    field public static final int weekDayTextAppearance = 16843592; // 0x1010348

core/api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ package android { 














  public static final class R.attr {















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













    field @FlaggedApi("android.permission.flags.replace_body_sensor_permission_enabled") public static final int backgroundPermission;













    field @FlaggedApi("android.permission.flags.replace_body_sensor_permission_enabled") public static final int backgroundPermission = 16844455; // 0x10106a7















    field @FlaggedApi("android.content.res.manifest_flagging") public static final int featureFlag = 16844428; // 0x101068c















    field public static final int gameSessionService = 16844373; // 0x1010655















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










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













    field public static final int config_systemCallStreaming = 17039431; // 0x1040047















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















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













    field @FlaggedApi("android.content.pm.sdk_dependency_installer") public static final int config_systemDependencyInstaller;













    field @FlaggedApi("android.content.pm.sdk_dependency_installer") public static final int config_systemDependencyInstaller = 17039434; // 0x104004a















    field public static final int config_systemFinancedDeviceController = 17039430; // 0x1040046















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















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









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













    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 @FlaggedApi("android.permission.flags.system_vendor_intelligence_role_enabled") public static final int config_systemVendorIntelligence;













    field @FlaggedApi("android.permission.flags.system_vendor_intelligence_role_enabled") public static final int config_systemVendorIntelligence = 17039435; // 0x104004b















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















    field public static final int config_systemWearHealthService = 17039428; // 0x1040044















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

























core/res/res/values/public-final.xml



+82
−0




























Original line number
Diff line number
Diff line








@@ -3922,4 +3922,86 @@













  <public type="color" name="system_error_900" id="0x010600d0" />















  <public type="color" name="system_error_1000" id="0x010600d1" />





























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













    Resources added in version NEXT of the platform



























    NOTE: After this version of the platform is forked, changes cannot be made to the root













    branch's groups for that release. Only merge changes to the forked platform branch.













    =============================================================== -->













  <eat-comment/>



























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













    <public name="removed_" />













    <!-- @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") -->













    <public name="adServiceTypes" />













    <!-- @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") -->













    <public name="languageSettingsActivity"/>













    <!-- @FlaggedApi(android.service.controls.flags.Flags.FLAG_HOME_PANEL_DREAM) -->













    <public name="dreamCategory"/>













    <!-- @FlaggedApi("android.permission.flags.replace_body_sensor_permission_enabled")













         @hide @SystemApi -->













    <public name="backgroundPermission"/>













    <!-- @FlaggedApi(android.view.accessibility.supplemental_description) -->













    <public name="supplementalDescription"/>













    <!-- @FlaggedApi("android.security.enable_intent_matching_flags") -->













    <public name="intentMatchingFlags"/>













    <!-- @FlaggedApi(android.view.inputmethod.Flags.FLAG_IME_SWITCHER_REVAMP_API) -->













    <public name="layoutLabel"/>













    <public name="removed_" />













    <public name="removed_" />













    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) -->













    <public name="pageSizeCompat" />













    <!-- @FlaggedApi(android.nfc.Flags.FLAG_NFC_ASSOCIATED_ROLE_SERVICES) -->













    <public name="wantsRoleHolderPriority"/>













    <!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) -->













    <public name="minSdkVersionFull"/>













    <public name="removed_" />













    <public name="removed_" />













    <public name="removed_" />













    <public name="removed_" />













  </staging-public-group-final>



























  <!-- @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") -->













  <public type="attr" name="adServiceTypes" id="0x010106a4" />













  <!-- @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") -->













  <public type="attr" name="languageSettingsActivity" id="0x010106a5" />













  <!-- @FlaggedApi(android.service.controls.flags.Flags.FLAG_HOME_PANEL_DREAM) -->













  <public type="attr" name="dreamCategory" id="0x010106a6" />













  <!-- @FlaggedApi("android.permission.flags.replace_body_sensor_permission_enabled")













       @hide @SystemApi -->













  <public type="attr" name="backgroundPermission" id="0x010106a7" />













  <!-- @FlaggedApi(android.view.accessibility.supplemental_description) -->













  <public type="attr" name="supplementalDescription" id="0x010106a8" />













  <!-- @FlaggedApi("android.security.enable_intent_matching_flags") -->













  <public type="attr" name="intentMatchingFlags" id="0x010106a9" />













  <!-- @FlaggedApi(android.view.inputmethod.Flags.FLAG_IME_SWITCHER_REVAMP_API) -->













  <public type="attr" name="layoutLabel" id="0x010106aa" />













  <!-- @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) -->













  <public type="attr" name="pageSizeCompat" id="0x010106ab" />













  <!-- @FlaggedApi(android.nfc.Flags.FLAG_NFC_ASSOCIATED_ROLE_SERVICES) -->













  <public type="attr" name="wantsRoleHolderPriority" id="0x010106ac" />













  <!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) -->













  <public type="attr" name="minSdkVersionFull" id="0x010106ad" />



























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













    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SDK_DEPENDENCY_INSTALLER)













         @hide @SystemApi -->













    <public name="config_systemDependencyInstaller" />













    <!-- @hide @SystemApi -->













    <public name="removed_config_defaultReservedForTestingProfileGroupExclusivity" />













    <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_SYSTEM_VENDOR_INTELLIGENCE_ROLE_ENABLED)













         @hide @SystemApi -->













    <public name="config_systemVendorIntelligence" />













    <public name="removed_" />













    <public name="removed_" />













    <public name="removed_" />













  </staging-public-group-final>



























  <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SDK_DEPENDENCY_INSTALLER)













       @hide @SystemApi -->













  <public type="string" name="config_systemDependencyInstaller" id="0x0104004a" />













  <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_SYSTEM_VENDOR_INTELLIGENCE_ROLE_ENABLED)













       @hide @SystemApi -->













  <public type="string" name="config_systemVendorIntelligence" id="0x0104004b" />





























</resources>
























core/res/res/values/public-staging.xml



+18
−51




























Original line number
Diff line number
Diff line








@@ -109,34 +109,13 @@













    =============================================================== -->















  <eat-comment/>





























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













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















      <!-- @FlaggedApi("android.content.pm.sdk_lib_independence") -->















    <public name="optional"/>













    <!-- @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") -->













    <public name="adServiceTypes" />













    <!-- @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") -->













    <public name="languageSettingsActivity"/>













    <!-- @FlaggedApi(android.service.controls.flags.Flags.FLAG_HOME_PANEL_DREAM) -->













    <public name="dreamCategory"/>













    <!-- @FlaggedApi("android.permission.flags.replace_body_sensor_permission_enabled")













         @hide @SystemApi -->













    <public name="backgroundPermission"/>













    <!-- @FlaggedApi(android.view.accessibility.supplemental_description) -->













    <public name="supplementalDescription"/>













    <!-- @FlaggedApi("android.security.enable_intent_matching_flags") -->













    <public name="intentMatchingFlags"/>













    <!-- @FlaggedApi(android.view.inputmethod.Flags.FLAG_IME_SWITCHER_REVAMP_API) -->













    <public name="layoutLabel"/>















    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_CHANGE_LAUNCHER_BADGING) -->















    <public name="alternateLauncherIcons"/>















    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_CHANGE_LAUNCHER_BADGING) -->















    <public name="alternateLauncherLabels"/>













    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) -->













    <public name="pageSizeCompat" />













    <!-- @FlaggedApi(android.nfc.Flags.FLAG_NFC_ASSOCIATED_ROLE_SERVICES) -->













    <public name="wantsRoleHolderPriority"/>













    <!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) -->













    <public name="minSdkVersionFull"/>















    <!-- @hide Only for device overlay to use this. -->















    <public name="pointerIconVectorFill"/>















    <!-- @hide Only for device overlay to use this. -->









@@ -147,39 +126,27 @@













    <public name="pointerIconVectorStrokeInverse"/>















  </staging-public-group>





























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













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















    <!-- @FlaggedApi(android.appwidget.flags.Flags.FLAG_ENGAGEMENT_METRICS) -->















    <public name="remoteViewsMetricsId"/>















  </staging-public-group>





























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













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















  </staging-public-group>





























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













    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SDK_DEPENDENCY_INSTALLER)













         @hide @SystemApi -->













    <public name="config_systemDependencyInstaller" />













    <!-- @hide @SystemApi -->













    <public name="removed_config_defaultReservedForTestingProfileGroupExclusivity" />













    <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_SYSTEM_VENDOR_INTELLIGENCE_ROLE_ENABLED)













         @hide @SystemApi -->













    <public name="config_systemVendorIntelligence" />



























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















    <!-- @FlaggedApi(android.app.ondeviceintelligence.flags.Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE)















     @hide @SystemApi -->















    <public name="config_defaultOnDeviceIntelligenceService" />





























    <!-- @FlaggedApi(android.app.ondeviceintelligence.flags.Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE)















     @hide @SystemApi -->















    <public name="config_defaultOnDeviceSandboxedInferenceService" />





























    <!-- @FlaggedApi(android.app.ondeviceintelligence.flags.Flags.FLAG_ENABLE_ON_DEVICE_INTELLIGENCE_MODULE)















     @hide @SystemApi -->















    <public name="config_defaultOnDeviceIntelligenceDeviceConfigNamespace" />





























  </staging-public-group>





























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













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















    <!-- @FlaggedApi(android.os.Flags.FLAG_MATERIAL_MOTION_TOKENS)-->















    <public name="config_motionStandardFastSpatialDamping"/>















    <!-- @FlaggedApi(android.os.Flags.FLAG_MATERIAL_MOTION_TOKENS)-->










@@ -216,7 +183,7 @@













    <public name="config_shapeCornerRadiusXlarge"/>















  </staging-public-group>





























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













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















    <!-- @FlaggedApi(android.os.Flags.FLAG_MATERIAL_COLORS_10_2024)-->















    <public name="system_inverse_on_surface_light"/>















    <!-- @FlaggedApi(android.os.Flags.FLAG_MATERIAL_COLORS_10_2024)-->









@@ -243,28 +210,28 @@













    <public name="system_surface_tint_dark"/>















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















    <!-- @FlaggedApi(android.os.Flags.FLAG_MATERIAL_MOTION_TOKENS)-->















    <public name="config_motionStandardFastSpatialStiffness"/>















    <!-- @FlaggedApi(android.os.Flags.FLAG_MATERIAL_MOTION_TOKENS)-->









@@ -291,16 +258,16 @@













    <public name="config_motionExpressiveSlowEffectStiffness"/>















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















  </staging-public-group>





























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













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















  </staging-public-group>































</resources>