[Tokens] Added new shape appearance styles.

PiperOrigin-RevId: 433486068
material-components · Mar 9, 2022 · a5b78e6 · a5b78e6
1 parent b9a21f0
commit a5b78e6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/lib/java/com/google/android/material/shape/res/values/styles.xml b/lib/java/com/google/android/material/shape/res/values/styles.xml
@@ -33,7 +33,24 @@
     <item name="cornerSize">@dimen/mtrl_shape_corner_size_large_component</item>
   </style>
 
-  <style name="ShapeAppearance.Material3.SmallComponent" parent="ShapeAppearance.M3.Sys.Shape.Small"/>
-  <style name="ShapeAppearance.Material3.MediumComponent" parent="ShapeAppearance.M3.Sys.Shape.Medium"/>
-  <style name="ShapeAppearance.Material3.LargeComponent" parent="ShapeAppearance.M3.Sys.Shape.Large"/>
+  <style name="ShapeAppearance.Material3.Corner.None" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
+  <style name="ShapeAppearance.Material3.Corner.ExtraSmall" parent="ShapeAppearance.M3.Sys.Shape.Corner.ExtraSmall"/>
+  <style name="ShapeAppearance.Material3.Corner.Small" parent="ShapeAppearance.M3.Sys.Shape.Corner.Small"/>
+  <style name="ShapeAppearance.Material3.Corner.Medium" parent="ShapeAppearance.M3.Sys.Shape.Corner.Medium"/>
+  <style name="ShapeAppearance.Material3.Corner.Large" parent="ShapeAppearance.M3.Sys.Shape.Corner.Large"/>
+  <style name="ShapeAppearance.Material3.Corner.ExtraLarge" parent="ShapeAppearance.M3.Sys.Shape.Corner.ExtraLarge"/>
+  <style name="ShapeAppearance.Material3.Corner.Full" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
+
+  <style name="ShapeAppearance.Material3.SmallComponent" parent="">
+    <item name="cornerFamily">rounded</item>
+    <item name="cornerSize">4dp</item>
+  </style>
+  <style name="ShapeAppearance.Material3.MediumComponent" parent="">
+    <item name="cornerFamily">rounded</item>
+    <item name="cornerSize">8dp</item>
+  </style>
+  <style name="ShapeAppearance.Material3.LargeComponent" parent="">
+    <item name="cornerFamily">rounded</item>
+    <item name="cornerSize">8dp</item>
+  </style>
 </resources>
diff --git a/lib/java/com/google/android/material/shape/res/values/tokens.xml b/lib/java/com/google/android/material/shape/res/values/tokens.xml
@@ -71,17 +71,4 @@
     <item name="cornerSizeTopLeft">4dp</item>
     <item name="cornerSizeTopRight">4dp</item>
   </style>
-  <!-- Deprecated tokens -->
-  <style name="ShapeAppearance.M3.Sys.Shape.Large" parent="">
-    <item name="cornerFamily">rounded</item>
-    <item name="cornerSize">8dp</item>
-  </style>
-  <style name="ShapeAppearance.M3.Sys.Shape.Medium" parent="">
-    <item name="cornerFamily">rounded</item>
-    <item name="cornerSize">8dp</item>
-  </style>
-  <style name="ShapeAppearance.M3.Sys.Shape.Small" parent="">
-    <item name="cornerFamily">rounded</item>
-    <item name="cornerSize">4dp</item>
-  </style>
 </resources>