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

Commit 5518e7f2 authored by Todd Lee's avatar Todd Lee Committed by Android (Google) Code Review
Browse files

Merge "Add material motion token config resources" into main

parents cdcb116b f52957ad

core/api/current.txt

+24 −0
Original line number Diff line number Diff line
@@ -2187,6 +2187,18 @@ 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 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
@@ -2483,6 +2495,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 public static final int config_shortAnimTime = 17694720; // 0x10e0000

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

  }

core/java/android/os/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -224,6 +224,14 @@ flag { 
    }

}



flag {

    name: "material_motion_tokens"

    namespace: "systemui"

    description: "Adding new Material Tokens for M3 Motion Spec"

    bug: "324922198"

    is_exported: true

}



flag {

    name: "message_queue_tail_tracking"

    namespace: "system_performance"

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

+36 −0
Original line number Diff line number Diff line
@@ -33,4 +33,40 @@ 
    <!-- Style the scrollbars accoridngly. -->

    <drawable name="config_scrollbarThumbVertical">@drawable/scrollbar_vertical_thumb</drawable>

    <drawable name="config_scrollbarTrackVertical">@drawable/scrollbar_vertical_track</drawable>



    <!--

         Material motion physics configs

         values from https://carbon.googleplex.com/wear-m3/pages/motion/tokens-and-specs/40358758-8b8c-4d46-9391-a8fff2d91197#15087d76-8a5a-4d52-a210-efc2cd479a66

     -->

    <!-- standard -->

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

    <integer name="config_motionStandardFastSpatialStiffness">1400</integer>

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

    <integer name="config_motionStandardFastEffectStiffness">1400</integer>



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

    <integer name="config_motionStandardDefaultSpatialStiffness">500</integer>

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

    <integer name="config_motionStandardDefaultEffectStiffness">500</integer>



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

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

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

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



    <!-- expressive -->

    <item name="config_motionExpressiveFastSpatialDamping" format="float" type="dimen">0.7</item>

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

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

    <integer name="config_motionExpressiveFastEffectStiffness">1400</integer>



    <item name="config_motionExpressiveDefaultSpatialDamping" format="float" type="dimen">0.75</item>

    <integer name="config_motionExpressiveDefaultSpatialStiffness">350</integer>

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

    <integer name="config_motionExpressiveDefaultEffectStiffness">500</integer>



    <item name="config_motionExpressiveSlowSpatialDamping" format="float" type="dimen">0.8</item>

    <integer name="config_motionExpressiveSlowSpatialStiffness">200</integer>

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

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

</resources>

core/res/res/values/config_material.xml

+37 −0
Original line number Diff line number Diff line
@@ -38,4 +38,41 @@ 
    <!-- Style the scrollbars accoridngly. -->

    <drawable name="config_scrollbarThumbVertical">@drawable/scrollbar_handle_material</drawable>

    <drawable name="config_scrollbarTrackVertical">@null</drawable>



    <!--

         Material motion physics configs

         values from https://carbon.googleplex.com/google-material-3/pages/motion/how-it-works/1d566b15-2923-4e40-bd1e-25a867b96cbb#7520e861-2251-4ddb-af33-59df0d233d21

    -->

    <!-- standard -->

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

    <integer name="config_motionStandardFastSpatialStiffness">1400</integer>

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

    <integer name="config_motionStandardFastEffectStiffness">3800</integer>



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

    <integer name="config_motionStandardDefaultSpatialStiffness">700</integer>

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

    <integer name="config_motionStandardDefaultEffectStiffness">1600</integer>



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

    <integer name="config_motionStandardSlowSpatialStiffness">300</integer>

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

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





    <!-- expressive -->

    <item name="config_motionExpressiveFastSpatialDamping" format="float" type="dimen">0.6</item>

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

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

    <integer name="config_motionExpressiveFastEffectStiffness">3800</integer>



    <item name="config_motionExpressiveDefaultSpatialDamping" format="float" type="dimen">0.8</item>

    <integer name="config_motionExpressiveDefaultSpatialStiffness">380</integer>

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

    <integer name="config_motionExpressiveDefaultEffectStiffness">1600</integer>



    <item name="config_motionExpressiveSlowSpatialDamping" format="float" type="dimen">0.8</item>

    <integer name="config_motionExpressiveSlowSpatialStiffness">200</integer>

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

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

</resources>

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

+48 −0
Original line number Diff line number Diff line
@@ -157,6 +157,30 @@ 
  </staging-public-group>



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

    <!-- @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"/>

  </staging-public-group>



  <staging-public-group type="color" first-id="0x01b20000">
@@ -208,6 +232,30 @@ 
  </staging-public-group>



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

    <!-- @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>



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