[Tokens] Upgraded to v0.126 for 1p and 3p.

PiperOrigin-RevId: 475355503
material-components · Sep 20, 2022 · 1ef53e2 · 1ef53e2
1 parent a2ce1dd
commit 1ef53e2
Show file tree

Hide file tree

Showing 22 changed files with 189 additions and 198 deletions.
diff --git a/lib/java/com/google/android/material/bottomappbar/res/values/tokens.xml b/lib/java/com/google/android/material/bottomappbar/res/values/tokens.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
 -->
 <!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
-<!-- Version: v0.99 -->
+<!-- Version: v0.126 -->
 
 <resources>
   <!-- Generated from token set (md.comp.bottom-app-bar) in default context. -->

diff --git a/.../google/android/material/checkbox/res/drawable/mtrl_checkbox_button_checked_unchecked.xml b/.../google/android/material/checkbox/res/drawable/mtrl_checkbox_button_checked_unchecked.xml
@@ -22,7 +22,7 @@
   <target android:name="@string/mtrl_checkbox_button_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_150"
+        android:duration="@integer/m3_sys_motion_duration_short3"
         android:interpolator="?attr/motionEasingEmphasizedAccelerateInterpolator"
         android:propertyName="scaleX"
         android:valueFrom="1.0"
@@ -33,7 +33,7 @@
   <target android:name="@string/mtrl_checkbox_button_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_150"
+        android:duration="@integer/m3_sys_motion_duration_short3"
         android:interpolator="?attr/motionEasingEmphasizedAccelerateInterpolator"
         android:propertyName="scaleY"
         android:valueFrom="1.0"
@@ -44,7 +44,7 @@
   <target android:name="@string/mtrl_checkbox_button_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_50"
+        android:duration="@integer/m3_sys_motion_duration_short1"
         android:interpolator="?attr/motionEasingLinearInterpolator"
         android:propertyName="fillAlpha"
         android:valueFrom="1.0"

diff --git a/...ndroid/material/checkbox/res/drawable/mtrl_checkbox_button_icon_checked_indeterminate.xml b/...ndroid/material/checkbox/res/drawable/mtrl_checkbox_button_icon_checked_indeterminate.xml
@@ -22,7 +22,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_350"
+        android:duration="@integer/m3_sys_motion_duration_medium3"
         android:interpolator="?attr/motionEasingEmphasizedAccelerateInterpolator"
         android:propertyName="pathData"
         android:valueFrom="@string/mtrl_checkbox_button_icon_path_checked"

diff --git a/...le/android/material/checkbox/res/drawable/mtrl_checkbox_button_icon_checked_unchecked.xml b/...le/android/material/checkbox/res/drawable/mtrl_checkbox_button_icon_checked_unchecked.xml
@@ -22,7 +22,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_150"
+        android:duration="@integer/m3_sys_motion_duration_short3"
         android:interpolator="?attr/motionEasingEmphasizedAccelerateInterpolator"
         android:propertyName="scaleX"
         android:valueFrom="1.0"
@@ -33,7 +33,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_150"
+        android:duration="@integer/m3_sys_motion_duration_short3"
         android:interpolator="?attr/motionEasingEmphasizedAccelerateInterpolator"
         android:propertyName="scaleY"
         android:valueFrom="1.0"
@@ -44,7 +44,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_50"
+        android:duration="@integer/m3_sys_motion_duration_short1"
         android:interpolator="?attr/motionEasingLinearInterpolator"
         android:propertyName="fillAlpha"
         android:valueFrom="1.0"

diff --git a/...ndroid/material/checkbox/res/drawable/mtrl_checkbox_button_icon_indeterminate_checked.xml b/...ndroid/material/checkbox/res/drawable/mtrl_checkbox_button_icon_indeterminate_checked.xml
@@ -22,7 +22,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_350"
+        android:duration="@integer/m3_sys_motion_duration_medium3"
         android:interpolator="?attr/motionEasingEmphasizedAccelerateInterpolator"
         android:propertyName="pathData"
         android:valueFrom="@string/mtrl_checkbox_button_icon_path_indeterminate"

diff --git a/...roid/material/checkbox/res/drawable/mtrl_checkbox_button_icon_indeterminate_unchecked.xml b/...roid/material/checkbox/res/drawable/mtrl_checkbox_button_icon_indeterminate_unchecked.xml
@@ -22,7 +22,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_150"
+        android:duration="@integer/m3_sys_motion_duration_short3"
         android:interpolator="?attr/motionEasingEmphasizedAccelerateInterpolator"
         android:propertyName="scaleX"
         android:valueFrom="1.0"
@@ -33,7 +33,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_150"
+        android:duration="@integer/m3_sys_motion_duration_short3"
         android:interpolator="?attr/motionEasingEmphasizedAccelerateInterpolator"
         android:propertyName="scaleY"
         android:valueFrom="1.0"
@@ -44,7 +44,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_50"
+        android:duration="@integer/m3_sys_motion_duration_short1"
         android:interpolator="?attr/motionEasingLinearInterpolator"
         android:propertyName="fillAlpha"
         android:valueFrom="1.0"

diff --git a/...le/android/material/checkbox/res/drawable/mtrl_checkbox_button_icon_unchecked_checked.xml b/...le/android/material/checkbox/res/drawable/mtrl_checkbox_button_icon_unchecked_checked.xml
@@ -22,7 +22,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_350"
+        android:duration="@integer/m3_sys_motion_duration_medium3"
         android:interpolator="?attr/motionEasingEmphasizedDecelerateInterpolator"
         android:propertyName="scaleX"
         android:valueFrom="0.6"
@@ -33,7 +33,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_350"
+        android:duration="@integer/m3_sys_motion_duration_medium3"
         android:interpolator="?attr/motionEasingEmphasizedDecelerateInterpolator"
         android:propertyName="scaleY"
         android:valueFrom="0.6"
@@ -44,7 +44,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_350"
+        android:duration="@integer/m3_sys_motion_duration_medium3"
         android:interpolator="?attr/motionEasingEmphasizedDecelerateInterpolator"
         android:propertyName="trimPathEnd"
         android:valueFrom="0.0"

diff --git a/...roid/material/checkbox/res/drawable/mtrl_checkbox_button_icon_unchecked_indeterminate.xml b/...roid/material/checkbox/res/drawable/mtrl_checkbox_button_icon_unchecked_indeterminate.xml
@@ -22,7 +22,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_350"
+        android:duration="@integer/m3_sys_motion_duration_medium3"
         android:interpolator="?attr/motionEasingEmphasizedDecelerateInterpolator"
         android:propertyName="scaleX"
         android:valueFrom="0.6"
@@ -33,7 +33,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_350"
+        android:duration="@integer/m3_sys_motion_duration_medium3"
         android:interpolator="?attr/motionEasingEmphasizedDecelerateInterpolator"
         android:propertyName="scaleY"
         android:valueFrom="0.6"
@@ -44,7 +44,7 @@
   <target android:name="@string/mtrl_checkbox_button_icon_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_50"
+        android:duration="@integer/m3_sys_motion_duration_short1"
         android:interpolator="?attr/motionEasingLinearInterpolator"
         android:propertyName="fillAlpha"
         android:valueFrom="0.0"

diff --git a/.../google/android/material/checkbox/res/drawable/mtrl_checkbox_button_unchecked_checked.xml b/.../google/android/material/checkbox/res/drawable/mtrl_checkbox_button_unchecked_checked.xml
@@ -22,7 +22,7 @@
   <target android:name="@string/mtrl_checkbox_button_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_350"
+        android:duration="@integer/m3_sys_motion_duration_medium3"
         android:interpolator="?attr/motionEasingEmphasizedDecelerateInterpolator"
         android:propertyName="scaleX"
         android:valueFrom="0.6"
@@ -33,7 +33,7 @@
   <target android:name="@string/mtrl_checkbox_button_path_group_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_350"
+        android:duration="@integer/m3_sys_motion_duration_medium3"
         android:interpolator="?attr/motionEasingEmphasizedDecelerateInterpolator"
         android:propertyName="scaleY"
         android:valueFrom="0.6"
@@ -44,7 +44,7 @@
   <target android:name="@string/mtrl_checkbox_button_path_name">
     <aapt:attr name="android:animation">
       <objectAnimator
-        android:duration="@integer/m3_sys_motion_duration_50"
+        android:duration="@integer/m3_sys_motion_duration_short1"
         android:interpolator="?attr/motionEasingLinearInterpolator"
         android:propertyName="fillAlpha"
         android:valueFrom="0.0"

diff --git a/lib/java/com/google/android/material/color/res/values-v31/tokens.xml b/lib/java/com/google/android/material/color/res/values-v31/tokens.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
 -->
 <!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
-<!-- Version: v0.99 -->
+<!-- Version: v0.126 -->
 
 <resources>
   <!-- Generated from token set (md.sys.color) in context (theme=dark). -->
@@ -47,6 +47,7 @@
   <color name="m3_sys_color_dynamic_dark_on_background">@color/m3_ref_palette_dynamic_neutral90</color>
   <!-- Hairline colors -->
   <color name="m3_sys_color_dynamic_dark_outline">@color/m3_ref_palette_dynamic_neutral_variant60</color>
+  <color name="m3_sys_color_dynamic_dark_outline_variant">@color/m3_ref_palette_dynamic_neutral_variant30</color>
 
   <!-- Generated from token set (md.sys.color) in context (theme=light). -->
   <!-- Primary colors -->
@@ -77,6 +78,7 @@
   <color name="m3_sys_color_dynamic_light_on_background">@color/m3_ref_palette_dynamic_neutral10</color>
   <!-- Hairline colors -->
   <color name="m3_sys_color_dynamic_light_outline">@color/m3_ref_palette_dynamic_neutral_variant50</color>
+  <color name="m3_sys_color_dynamic_light_outline_variant">@color/m3_ref_palette_dynamic_neutral_variant80</color>
 
   <!-- Generated from token set (md.ref.palette) in default context. -->
   <!-- Baseline palette – Primary -->

diff --git a/lib/java/com/google/android/material/color/res/values/tokens.xml b/lib/java/com/google/android/material/color/res/values/tokens.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
 -->
 <!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
-<!-- Version: v0.99 -->
+<!-- Version: v0.126 -->
 
 <resources>
   <!-- Generated from token set (md.sys.color) in context (theme=dark). -->
@@ -48,11 +48,12 @@
   <color name="m3_sys_color_dark_on_background">@color/m3_ref_palette_neutral90</color>
   <!-- Hairline colors -->
   <color name="m3_sys_color_dark_outline">@color/m3_ref_palette_neutral_variant60</color>
+  <color name="m3_sys_color_dark_outline_variant">@color/m3_ref_palette_neutral_variant30</color>
   <!-- Error colors -->
   <color name="m3_sys_color_dark_error">@color/m3_ref_palette_error80</color>
   <color name="m3_sys_color_dark_error_container">@color/m3_ref_palette_error30</color>
   <color name="m3_sys_color_dark_on_error">@color/m3_ref_palette_error20</color>
-  <color name="m3_sys_color_dark_on_error_container">@color/m3_ref_palette_error80</color>
+  <color name="m3_sys_color_dark_on_error_container">@color/m3_ref_palette_error90</color>
 
   <!-- Generated from token set (md.sys.color) in context (theme=light). -->
   <!-- Primary colors -->
@@ -84,6 +85,7 @@
   <color name="m3_sys_color_light_on_background">@color/m3_ref_palette_neutral10</color>
   <!-- Hairline colors -->
   <color name="m3_sys_color_light_outline">@color/m3_ref_palette_neutral_variant50</color>
+  <color name="m3_sys_color_light_outline_variant">@color/m3_ref_palette_neutral_variant80</color>
   <!-- Error colors -->
   <color name="m3_sys_color_light_error">@color/m3_ref_palette_error40</color>
   <color name="m3_sys_color_light_error_container">@color/m3_ref_palette_error90</color>

diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
@@ -218,22 +218,22 @@
     <item name="motionEasingDecelerated">@string/m3_sys_motion_easing_legacy_decelerate</item>
     <item name="motionEasingAccelerated">@string/m3_sys_motion_easing_legacy_accelerate</item>
     <item name="motionEasingLinear">@string/m3_sys_motion_easing_linear</item>
-    <item name="motionDurationShort1">@integer/m3_sys_motion_duration_50</item>
-    <item name="motionDurationShort2">@integer/m3_sys_motion_duration_100</item>
-    <item name="motionDurationShort3">@integer/m3_sys_motion_duration_150</item>
-    <item name="motionDurationShort4">@integer/m3_sys_motion_duration_200</item>
-    <item name="motionDurationMedium1">@integer/m3_sys_motion_duration_250</item>
-    <item name="motionDurationMedium2">@integer/m3_sys_motion_duration_300</item>
-    <item name="motionDurationMedium3">@integer/m3_sys_motion_duration_350</item>
-    <item name="motionDurationMedium4">@integer/m3_sys_motion_duration_400</item>
-    <item name="motionDurationLong1">@integer/m3_sys_motion_duration_450</item>
-    <item name="motionDurationLong2">@integer/m3_sys_motion_duration_500</item>
-    <item name="motionDurationLong3">@integer/m3_sys_motion_duration_550</item>
-    <item name="motionDurationLong4">@integer/m3_sys_motion_duration_600</item>
-    <item name="motionDurationExtraLong1">@integer/m3_sys_motion_duration_700</item>
-    <item name="motionDurationExtraLong2">@integer/m3_sys_motion_duration_800</item>
-    <item name="motionDurationExtraLong3">@integer/m3_sys_motion_duration_900</item>
-    <item name="motionDurationExtraLong4">@integer/m3_sys_motion_duration_1000</item>
+    <item name="motionDurationShort1">@integer/m3_sys_motion_duration_short1</item>
+    <item name="motionDurationShort2">@integer/m3_sys_motion_duration_short2</item>
+    <item name="motionDurationShort3">@integer/m3_sys_motion_duration_short3</item>
+    <item name="motionDurationShort4">@integer/m3_sys_motion_duration_short4</item>
+    <item name="motionDurationMedium1">@integer/m3_sys_motion_duration_medium1</item>
+    <item name="motionDurationMedium2">@integer/m3_sys_motion_duration_medium2</item>
+    <item name="motionDurationMedium3">@integer/m3_sys_motion_duration_medium3</item>
+    <item name="motionDurationMedium4">@integer/m3_sys_motion_duration_medium4</item>
+    <item name="motionDurationLong1">@integer/m3_sys_motion_duration_long1</item>
+    <item name="motionDurationLong2">@integer/m3_sys_motion_duration_long2</item>
+    <item name="motionDurationLong3">@integer/m3_sys_motion_duration_long3</item>
+    <item name="motionDurationLong4">@integer/m3_sys_motion_duration_long4</item>
+    <item name="motionDurationExtraLong1">@integer/m3_sys_motion_duration_extra_long1</item>
+    <item name="motionDurationExtraLong2">@integer/m3_sys_motion_duration_extra_long2</item>
+    <item name="motionDurationExtraLong3">@integer/m3_sys_motion_duration_extra_long3</item>
+    <item name="motionDurationExtraLong4">@integer/m3_sys_motion_duration_extra_long4</item>
     <item name="motionPath">@macro/m3_sys_motion_path</item>
 
     <!-- Elevation overlays. -->
@@ -453,22 +453,22 @@
     <item name="motionEasingDecelerated">@string/m3_sys_motion_easing_legacy_decelerate</item>
     <item name="motionEasingAccelerated">@string/m3_sys_motion_easing_legacy_accelerate</item>
     <item name="motionEasingLinear">@string/m3_sys_motion_easing_linear</item>
-    <item name="motionDurationShort1">@integer/m3_sys_motion_duration_50</item>
-    <item name="motionDurationShort2">@integer/m3_sys_motion_duration_100</item>
-    <item name="motionDurationShort3">@integer/m3_sys_motion_duration_150</item>
-    <item name="motionDurationShort4">@integer/m3_sys_motion_duration_200</item>
-    <item name="motionDurationMedium1">@integer/m3_sys_motion_duration_250</item>
-    <item name="motionDurationMedium2">@integer/m3_sys_motion_duration_300</item>
-    <item name="motionDurationMedium3">@integer/m3_sys_motion_duration_350</item>
-    <item name="motionDurationMedium4">@integer/m3_sys_motion_duration_400</item>
-    <item name="motionDurationLong1">@integer/m3_sys_motion_duration_450</item>
-    <item name="motionDurationLong2">@integer/m3_sys_motion_duration_500</item>
-    <item name="motionDurationLong3">@integer/m3_sys_motion_duration_550</item>
-    <item name="motionDurationLong4">@integer/m3_sys_motion_duration_600</item>
-    <item name="motionDurationExtraLong1">@integer/m3_sys_motion_duration_700</item>
-    <item name="motionDurationExtraLong2">@integer/m3_sys_motion_duration_800</item>
-    <item name="motionDurationExtraLong3">@integer/m3_sys_motion_duration_900</item>
-    <item name="motionDurationExtraLong4">@integer/m3_sys_motion_duration_1000</item>
+    <item name="motionDurationShort1">@integer/m3_sys_motion_duration_short1</item>
+    <item name="motionDurationShort2">@integer/m3_sys_motion_duration_short2</item>
+    <item name="motionDurationShort3">@integer/m3_sys_motion_duration_short3</item>
+    <item name="motionDurationShort4">@integer/m3_sys_motion_duration_short4</item>
+    <item name="motionDurationMedium1">@integer/m3_sys_motion_duration_medium1</item>
+    <item name="motionDurationMedium2">@integer/m3_sys_motion_duration_medium2</item>
+    <item name="motionDurationMedium3">@integer/m3_sys_motion_duration_medium3</item>
+    <item name="motionDurationMedium4">@integer/m3_sys_motion_duration_medium4</item>
+    <item name="motionDurationLong1">@integer/m3_sys_motion_duration_long1</item>
+    <item name="motionDurationLong2">@integer/m3_sys_motion_duration_long2</item>
+    <item name="motionDurationLong3">@integer/m3_sys_motion_duration_long3</item>
+    <item name="motionDurationLong4">@integer/m3_sys_motion_duration_long4</item>
+    <item name="motionDurationExtraLong1">@integer/m3_sys_motion_duration_extra_long1</item>
+    <item name="motionDurationExtraLong2">@integer/m3_sys_motion_duration_extra_long2</item>
+    <item name="motionDurationExtraLong3">@integer/m3_sys_motion_duration_extra_long3</item>
+    <item name="motionDurationExtraLong4">@integer/m3_sys_motion_duration_extra_long4</item>
     <item name="motionPath">@macro/m3_sys_motion_path</item>
 
     <!-- Elevation overlays. -->

diff --git a/lib/java/com/google/android/material/elevation/res/values/tokens.xml b/lib/java/com/google/android/material/elevation/res/values/tokens.xml
@@ -15,14 +15,14 @@
   ~ limitations under the License.
 -->
 <!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
-<!-- Version: v0.99 -->
+<!-- Version: v0.126 -->
 
 <resources>
   <!-- Generated from token set (md.sys.elevation) in default context. -->
-  <dimen name="m3_sys_elevation_level0">0dp</dimen>
-  <dimen name="m3_sys_elevation_level1">1dp</dimen>
-  <dimen name="m3_sys_elevation_level2">3dp</dimen>
-  <dimen name="m3_sys_elevation_level3">6dp</dimen>
-  <dimen name="m3_sys_elevation_level4">8dp</dimen>
   <dimen name="m3_sys_elevation_level5">12dp</dimen>
+  <dimen name="m3_sys_elevation_level4">8dp</dimen>
+  <dimen name="m3_sys_elevation_level3">6dp</dimen>
+  <dimen name="m3_sys_elevation_level2">3dp</dimen>
+  <dimen name="m3_sys_elevation_level1">1dp</dimen>
+  <dimen name="m3_sys_elevation_level0">0dp</dimen>
 </resources>
diff --git a/lib/java/com/google/android/material/materialswitch/res/values/tokens.xml b/lib/java/com/google/android/material/materialswitch/res/values/tokens.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
 -->
 <!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
-<!-- Version: v0.99 -->
+<!-- Version: v0.126 -->
 
 <resources>
   <!-- Generated from token set (md.comp.switch) in default context. -->