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

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

Merge "Finalize resources for 36.1" into main

parents e4e53bea 2172d314

core/api/current.txt

+30 −30
Original line number Diff line number Diff line
@@ -2216,23 +2216,23 @@ package android { 
  public static final class R.dimen {

    ctor public R.dimen();

    field public static final int app_icon_size = 17104896; // 0x1050000

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveDefaultEffectDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveDefaultSpatialDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveFastEffectDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveFastSpatialDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveSlowEffectDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveSlowSpatialDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardDefaultEffectDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardDefaultSpatialDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardFastEffectDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardFastSpatialDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowEffectDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowSpatialDamping;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusLarge;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusMedium;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusSmall;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusXlarge;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusXsmall;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveDefaultEffectDamping = 17104916; // 0x1050014

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveDefaultSpatialDamping = 17104915; // 0x1050013

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveFastEffectDamping = 17104914; // 0x1050012

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveFastSpatialDamping = 17104913; // 0x1050011

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveSlowEffectDamping = 17104918; // 0x1050016

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveSlowSpatialDamping = 17104917; // 0x1050015

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardDefaultEffectDamping = 17104910; // 0x105000e

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardDefaultSpatialDamping = 17104909; // 0x105000d

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardFastEffectDamping = 17104908; // 0x105000c

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardFastSpatialDamping = 17104907; // 0x105000b

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowEffectDamping = 17104912; // 0x1050010

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowSpatialDamping = 17104911; // 0x105000f

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusLarge = 17104922; // 0x105001a

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusMedium = 17104921; // 0x1050019

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusSmall = 17104920; // 0x1050018

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusXlarge = 17104923; // 0x105001b

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusXsmall = 17104919; // 0x1050017

    field public static final int dialog_min_width_major = 17104899; // 0x1050003

    field public static final int dialog_min_width_minor = 17104900; // 0x1050004

    field public static final int notification_large_icon_height = 17104902; // 0x1050006
@@ -2445,7 +2445,7 @@ package android { 
    field public static final int accessibilityActionScrollRight = 16908347; // 0x102003b

    field public static final int accessibilityActionScrollToPosition = 16908343; // 0x1020037

    field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038

    field @FlaggedApi("android.view.accessibility.a11y_selection_api") public static final int accessibilityActionSetExtendedSelection;

    field @FlaggedApi("android.view.accessibility.a11y_selection_api") public static final int accessibilityActionSetExtendedSelection = 16908383; // 0x102005f

    field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d

    field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036

    field public static final int accessibilityActionShowTextSuggestions = 16908376; // 0x1020058
@@ -2529,18 +2529,18 @@ package android { 
    ctor public R.integer();

    field public static final int config_longAnimTime = 17694722; // 0x10e0002

    field public static final int config_mediumAnimTime = 17694721; // 0x10e0001

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveDefaultEffectStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveDefaultSpatialStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveFastEffectStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveFastSpatialStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveSlowEffectStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveSlowSpatialStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardDefaultEffectStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardDefaultSpatialStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardFastEffectStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardFastSpatialStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowEffectStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowSpatialStiffness;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveDefaultEffectStiffness = 17694733; // 0x10e000d

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveDefaultSpatialStiffness = 17694732; // 0x10e000c

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveFastEffectStiffness = 17694731; // 0x10e000b

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveFastSpatialStiffness = 17694730; // 0x10e000a

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveSlowEffectStiffness = 17694735; // 0x10e000f

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionExpressiveSlowSpatialStiffness = 17694734; // 0x10e000e

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardDefaultEffectStiffness = 17694727; // 0x10e0007

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardDefaultSpatialStiffness = 17694726; // 0x10e0006

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardFastEffectStiffness = 17694725; // 0x10e0005

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardFastSpatialStiffness = 17694724; // 0x10e0004

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowEffectStiffness = 17694729; // 0x10e0009

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowSpatialStiffness = 17694728; // 0x10e0008

    field public static final int config_shortAnimTime = 17694720; // 0x10e0000

    field @Deprecated public static final int status_bar_notification_info_maxnum = 17694723; // 0x10e0003

  }

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ package android { 
  public static final class R.bool {

    field public static final int config_enableDefaultNotes = 17891338; // 0x111000a

    field public static final int config_enableDefaultNotesForWorkProfile = 17891339; // 0x111000b

    field @FlaggedApi("android.content.pm.use_pia_v2") public static final int config_enableMaterialDesignInPackageInstaller;

    field @FlaggedApi("android.content.pm.use_pia_v2") public static final int config_enableMaterialDesignInPackageInstaller = 17891340; // 0x111000c

    field public static final int config_enableQrCodeScannerOnLockScreen = 17891336; // 0x1110008

    field public static final int config_safetyProtectionEnabled = 17891337; // 0x1110009

    field public static final int config_sendPackageName = 17891328; // 0x1110000

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

+152 −0
Original line number Diff line number Diff line
@@ -3999,4 +3999,156 @@ 
       @hide @SystemApi -->

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



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

    Resources added in version BAKLAVA_1 (36.1) 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="id" first-id="0x01b20000">

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

    <public name="removed_remoteViewsMetricsId"/>

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

    <public name="accessibilityActionSetExtendedSelection"/>

  </staging-public-group-final>



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

  <public type="id" name="accessibilityActionSetExtendedSelection" id="0x0102005f" />



  <staging-public-group-final 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)-->

    <public name="config_motionStandardFastEffectDamping"/>

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

    <public name="config_motionStandardDefaultSpatialDamping"/>

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

    <public name="config_motionStandardDefaultEffectDamping"/>

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

    <public name="config_motionStandardSlowSpatialDamping"/>

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

    <public name="config_motionStandardSlowEffectDamping"/>

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

    <public name="config_motionExpressiveFastSpatialDamping"/>

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

    <public name="config_motionExpressiveFastEffectDamping"/>

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

    <public name="config_motionExpressiveDefaultSpatialDamping"/>

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

    <public name="config_motionExpressiveDefaultEffectDamping"/>

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

    <public name="config_motionExpressiveSlowSpatialDamping"/>

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

    <public name="config_motionExpressiveSlowEffectDamping"/>

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

    <public name="config_shapeCornerRadiusXsmall"/>

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

    <public name="config_shapeCornerRadiusSmall"/>

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

    <public name="config_shapeCornerRadiusMedium"/>

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

    <public name="config_shapeCornerRadiusLarge"/>

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

    <public name="config_shapeCornerRadiusXlarge"/>

  </staging-public-group-final>



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

  <public type="dimen" name="config_motionStandardFastSpatialDamping" id="0x0105000b" />

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

  <public type="dimen" name="config_motionStandardFastEffectDamping" id="0x0105000c" />

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

  <public type="dimen" name="config_motionStandardDefaultSpatialDamping" id="0x0105000d" />

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

  <public type="dimen" name="config_motionStandardDefaultEffectDamping" id="0x0105000e" />

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

  <public type="dimen" name="config_motionStandardSlowSpatialDamping" id="0x0105000f" />

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

  <public type="dimen" name="config_motionStandardSlowEffectDamping" id="0x01050010" />

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

  <public type="dimen" name="config_motionExpressiveFastSpatialDamping" id="0x01050011" />

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

  <public type="dimen" name="config_motionExpressiveFastEffectDamping" id="0x01050012" />

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

  <public type="dimen" name="config_motionExpressiveDefaultSpatialDamping" id="0x01050013" />

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

  <public type="dimen" name="config_motionExpressiveDefaultEffectDamping" id="0x01050014" />

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

  <public type="dimen" name="config_motionExpressiveSlowSpatialDamping" id="0x01050015" />

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

  <public type="dimen" name="config_motionExpressiveSlowEffectDamping" id="0x01050016" />

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

  <public type="dimen" name="config_shapeCornerRadiusXsmall" id="0x01050017" />

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

  <public type="dimen" name="config_shapeCornerRadiusSmall" id="0x01050018" />

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

  <public type="dimen" name="config_shapeCornerRadiusMedium" id="0x01050019" />

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

  <public type="dimen" name="config_shapeCornerRadiusLarge" id="0x0105001a" />

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

  <public type="dimen" name="config_shapeCornerRadiusXlarge" id="0x0105001b" />



  <staging-public-group-final 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)-->

    <public name="config_motionStandardFastEffectStiffness"/>

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

    <public name="config_motionStandardDefaultSpatialStiffness"/>

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

    <public name="config_motionStandardDefaultEffectStiffness"/>

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

    <public name="config_motionStandardSlowSpatialStiffness"/>

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

    <public name="config_motionStandardSlowEffectStiffness"/>

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

    <public name="config_motionExpressiveFastSpatialStiffness"/>

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

    <public name="config_motionExpressiveFastEffectStiffness"/>

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

    <public name="config_motionExpressiveDefaultSpatialStiffness"/>

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

    <public name="config_motionExpressiveDefaultEffectStiffness"/>

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

    <public name="config_motionExpressiveSlowSpatialStiffness"/>

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

    <public name="config_motionExpressiveSlowEffectStiffness"/>

  </staging-public-group-final>



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

  <public type="integer" name="config_motionStandardFastSpatialStiffness" id="0x010e0004" />

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

  <public type="integer" name="config_motionStandardFastEffectStiffness" id="0x010e0005" />

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

  <public type="integer" name="config_motionStandardDefaultSpatialStiffness" id="0x010e0006" />

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

  <public type="integer" name="config_motionStandardDefaultEffectStiffness" id="0x010e0007" />

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

  <public type="integer" name="config_motionStandardSlowSpatialStiffness" id="0x010e0008" />

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

  <public type="integer" name="config_motionStandardSlowEffectStiffness" id="0x010e0009" />

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

  <public type="integer" name="config_motionExpressiveFastSpatialStiffness" id="0x010e000a" />

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

  <public type="integer" name="config_motionExpressiveFastEffectStiffness" id="0x010e000b" />

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

  <public type="integer" name="config_motionExpressiveDefaultSpatialStiffness" id="0x010e000c" />

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

  <public type="integer" name="config_motionExpressiveDefaultEffectStiffness" id="0x010e000d" />

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

  <public type="integer" name="config_motionExpressiveSlowSpatialStiffness" id="0x010e000e" />

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

  <public type="integer" name="config_motionExpressiveSlowEffectStiffness" id="0x010e000f" />



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

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

        @hide @SystemApi -->

    <public name="config_enableMaterialDesignInPackageInstaller" />

  </staging-public-group-final>



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

      @hide @SystemApi -->

  <public type="bool" name="config_enableMaterialDesignInPackageInstaller" id="0x0111000c" />



</resources>

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

+18 −92

File changed.

Preview size limit exceeded, changes collapsed.