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

Commit 735f651d authored by Todd Lee's avatar Todd Lee
Browse files

Add material shape token config resources 

Bug: b/324928718
Flag: android.os.material_shape_tokens
Test: presubmits
Change-Id: I8479c5406d457c3901f38621c85eaf4f48d2f915
parent c4fbcfab

core/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -2200,6 +2200,11 @@ package android { 
    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 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

core/java/android/os/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -232,6 +232,14 @@ flag { 
    is_exported: true

}



flag {

    name: "material_shape_tokens"

    namespace: "systemui"

    description: "Adding new Material Tokens for M3 Shape (corner radius) Spec"

    bug: "324928718"

    is_exported: true

}



flag {

    name: "message_queue_tail_tracking"

    namespace: "system_performance"

core/res/res/values-watch/config_material.xml

+10 −0
Original line number Diff line number Diff line
@@ -69,4 +69,14 @@ 
    <integer name="config_motionExpressiveSlowSpatialStiffness">200</integer>

    <item name="config_motionExpressiveSlowEffectDamping" format="float" type="dimen">1.0</item>

    <integer name="config_motionExpressiveSlowEffectStiffness">260</integer>



    <!--

        Material rounded corner configs

        Values from https://carbon.googleplex.com/wear-m3/tokens/designSystems/70fbaa4f7722a3d1/tokenSets/4fa2518eaeaf65eb

    -->

    <dimen name="config_shapeCornerRadiusXsmall">4dp</dimen>

    <dimen name="config_shapeCornerRadiusSmall">8dp</dimen>

    <dimen name="config_shapeCornerRadiusMedium">18dp</dimen>

    <dimen name="config_shapeCornerRadiusLarge">26dp</dimen>

    <dimen name="config_shapeCornerRadiusXlarge">36dp</dimen>

</resources>

core/res/res/values/config_material.xml

+10 −0
Original line number Diff line number Diff line
@@ -75,4 +75,14 @@ 
    <integer name="config_motionExpressiveSlowSpatialStiffness">200</integer>

    <item name="config_motionExpressiveSlowEffectDamping" format="float" type="dimen">1.0</item>

    <integer name="config_motionExpressiveSlowEffectStiffness">800</integer>



    <!--

        Material rounded corner configs

        Values from https://carbon.googleplex.com/google-material-3/tokens/designSystems/20543ce18892f7d9/tokenSets/21c40db4e4f5af15

    -->

    <dimen name="config_shapeCornerRadiusXsmall">4dp</dimen>

    <dimen name="config_shapeCornerRadiusSmall">8dp</dimen>

    <dimen name="config_shapeCornerRadiusMedium">12dp</dimen>

    <dimen name="config_shapeCornerRadiusLarge">16dp</dimen>

    <dimen name="config_shapeCornerRadiusXlarge">28dp</dimen>

</resources>

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

+10 −0
Original line number Diff line number Diff line
@@ -181,6 +181,16 @@ 
    <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>



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