Skip to content

Commit a5b78e6

Browse files
pekingmeveganafro
authored andcommitted
[Tokens] Added new shape appearance styles.
PiperOrigin-RevId: 433486068
1 parent b9a21f0 commit a5b78e6

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

lib/java/com/google/android/material/shape/res/values/styles.xml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,24 @@
3333
<item name="cornerSize">@dimen/mtrl_shape_corner_size_large_component</item>
3434
</style>
3535

36-
<style name="ShapeAppearance.Material3.SmallComponent" parent="ShapeAppearance.M3.Sys.Shape.Small"/>
37-
<style name="ShapeAppearance.Material3.MediumComponent" parent="ShapeAppearance.M3.Sys.Shape.Medium"/>
38-
<style name="ShapeAppearance.Material3.LargeComponent" parent="ShapeAppearance.M3.Sys.Shape.Large"/>
36+
<style name="ShapeAppearance.Material3.Corner.None" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
37+
<style name="ShapeAppearance.Material3.Corner.ExtraSmall" parent="ShapeAppearance.M3.Sys.Shape.Corner.ExtraSmall"/>
38+
<style name="ShapeAppearance.Material3.Corner.Small" parent="ShapeAppearance.M3.Sys.Shape.Corner.Small"/>
39+
<style name="ShapeAppearance.Material3.Corner.Medium" parent="ShapeAppearance.M3.Sys.Shape.Corner.Medium"/>
40+
<style name="ShapeAppearance.Material3.Corner.Large" parent="ShapeAppearance.M3.Sys.Shape.Corner.Large"/>
41+
<style name="ShapeAppearance.Material3.Corner.ExtraLarge" parent="ShapeAppearance.M3.Sys.Shape.Corner.ExtraLarge"/>
42+
<style name="ShapeAppearance.Material3.Corner.Full" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
43+
44+
<style name="ShapeAppearance.Material3.SmallComponent" parent="">
45+
<item name="cornerFamily">rounded</item>
46+
<item name="cornerSize">4dp</item>
47+
</style>
48+
<style name="ShapeAppearance.Material3.MediumComponent" parent="">
49+
<item name="cornerFamily">rounded</item>
50+
<item name="cornerSize">8dp</item>
51+
</style>
52+
<style name="ShapeAppearance.Material3.LargeComponent" parent="">
53+
<item name="cornerFamily">rounded</item>
54+
<item name="cornerSize">8dp</item>
55+
</style>
3956
</resources>

lib/java/com/google/android/material/shape/res/values/tokens.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,4 @@
7171
<item name="cornerSizeTopLeft">4dp</item>
7272
<item name="cornerSizeTopRight">4dp</item>
7373
</style>
74-
<!-- Deprecated tokens -->
75-
<style name="ShapeAppearance.M3.Sys.Shape.Large" parent="">
76-
<item name="cornerFamily">rounded</item>
77-
<item name="cornerSize">8dp</item>
78-
</style>
79-
<style name="ShapeAppearance.M3.Sys.Shape.Medium" parent="">
80-
<item name="cornerFamily">rounded</item>
81-
<item name="cornerSize">8dp</item>
82-
</style>
83-
<style name="ShapeAppearance.M3.Sys.Shape.Small" parent="">
84-
<item name="cornerFamily">rounded</item>
85-
<item name="cornerSize">4dp</item>
86-
</style>
8774
</resources>

0 commit comments

Comments
 (0)