Skip to content

Commit 0c1a914

Browse files
hunterstichleticiarossi
hunterstich
authored and
leticiarossi
committed
[Typography] Added emphasized typescale to public attributes
PiperOrigin-RevId: 752370865
1 parent a0b4dfa commit 0c1a914

File tree

3 files changed

+90
-6
lines changed

3 files changed

+90
-6
lines changed

‎catalog/java/io/material/catalog/font/res/values/arrays.xml‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
-->
1717
<resources>
1818

19-
<string-array name="cat_font_styles_array">
19+
<string-array name="cat_font_styles_array" translatable="false">
2020
<item>?attr/textAppearanceDisplayLarge</item>
2121
<item>?attr/textAppearanceDisplayMedium</item>
2222
<item>?attr/textAppearanceDisplaySmall</item>
@@ -32,9 +32,25 @@
3232
<item>?attr/textAppearanceLabelLarge</item>
3333
<item>?attr/textAppearanceLabelMedium</item>
3434
<item>?attr/textAppearanceLabelSmall</item>
35+
36+
<item>?attr/textAppearanceDisplayLargeEmphasized</item>
37+
<item>?attr/textAppearanceDisplayMediumEmphasized</item>
38+
<item>?attr/textAppearanceDisplaySmallEmphasized</item>
39+
<item>?attr/textAppearanceHeadlineLargeEmphasized</item>
40+
<item>?attr/textAppearanceHeadlineMediumEmphasized</item>
41+
<item>?attr/textAppearanceHeadlineSmallEmphasized</item>
42+
<item>?attr/textAppearanceTitleLargeEmphasized</item>
43+
<item>?attr/textAppearanceTitleMediumEmphasized</item>
44+
<item>?attr/textAppearanceTitleSmallEmphasized</item>
45+
<item>?attr/textAppearanceBodyLargeEmphasized</item>
46+
<item>?attr/textAppearanceBodyMediumEmphasized</item>
47+
<item>?attr/textAppearanceBodySmallEmphasized</item>
48+
<item>?attr/textAppearanceLabelLargeEmphasized</item>
49+
<item>?attr/textAppearanceLabelMediumEmphasized</item>
50+
<item>?attr/textAppearanceLabelSmallEmphasized</item>
3551
</string-array>
3652

37-
<string-array name="cat_font_style_names_array">
53+
<string-array name="cat_font_style_names_array" translatable="false">
3854
<item>Display Large</item>
3955
<item>Display Medium</item>
4056
<item>Display Small</item>
@@ -50,6 +66,22 @@
5066
<item>Label Large</item>
5167
<item>Label Medium</item>
5268
<item>Label Small</item>
69+
70+
<item>Display Large Emphasized</item>
71+
<item>Display Medium Emphasized</item>
72+
<item>Display Small Emphasized</item>
73+
<item>Headline Large Emphasized</item>
74+
<item>Headline Medium Emphasized</item>
75+
<item>Headline Small Emphasized</item>
76+
<item>Title Large Emphasized</item>
77+
<item>Title Medium Emphasized</item>
78+
<item>Title Small Emphasized</item>
79+
<item>Body Large Emphasized</item>
80+
<item>Body Medium Emphasized</item>
81+
<item>Body Small Emphasized</item>
82+
<item>Label Large Emphasized</item>
83+
<item>Label Medium Emphasized</item>
84+
<item>Label Small Emphasized</item>
5385
</string-array>
5486

5587
</resources>

‎docs/theming/Typography.md‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ in Material components.
2020

2121
## Usage
2222

23+
### Baseline scale
24+
2325
Attribute name | Default style
2426
------------------------------ | -------------
2527
`textAppearanceDisplayLarge` | Regular 57sp
@@ -38,6 +40,29 @@ Attribute name | Default style
3840
`textAppearanceLabelMedium` | Medium 12sp
3941
`textAppearanceLabelSmall` | Medium 11sp
4042

43+
### Emphasized scale
44+
45+
Emphasized styles are used to create hierarchy and are recommended for showing
46+
selection, actions, headlines, or other editorial treatments.
47+
48+
Attribute name | Default style
49+
---------------------------------------- | -------------
50+
`textAppearanceDisplayLargeEmphasized` | Medium 57sp
51+
`textAppearanceDisplayMediumEmphasized` | Medium 45sp
52+
`textAppearanceDisplaySmallEmphasized` | Medium 36sp
53+
`textAppearanceHeadlineLargeEmphasized` | Medium 32sp
54+
`textAppearanceHeadlineMediumEmphasized` | Medium 28sp
55+
`textAppearanceHeadlineSmallEmphasized` | Medium 24sp
56+
`textAppearanceTitleLargeEmphasized` | Medium 22sp
57+
`textAppearanceTitleMediumEmphasized` | Bold 16sp
58+
`textAppearanceTitleSmallEmphasized` | Bold 14sp
59+
`textAppearanceBodyLargeEmphasized` | Medium 16sp
60+
`textAppearanceBodyMediumEmphasized` | Medium 14sp
61+
`textAppearanceBodySmallEmphasized` | Medium 12sp
62+
`textAppearanceLabelLargeEmphasized` | Bold 14sp
63+
`textAppearanceLabelMediumEmphasized` | Bold 12sp
64+
`textAppearanceLabelSmallEmphasized` | Bold 11sp
65+
4166
## Style values
4267

4368
Style values are a combination of the following:
@@ -77,10 +102,6 @@ in your theme:
77102
</style>
78103
```
79104

80-
**Note:** `AppCompat` must be used to handle backwards compatibility for sdk <
81-
16. If you don't need to support devices < 16 and aren't using AppCompat, you
82-
should set `android:fontFamily` instead of `fontFamily` or `app:fontFamily`.
83-
84105
## Downloadable fonts
85106

86107
Android O and Android Support Library 26 add support for [Downloadable

‎lib/java/com/google/android/material/typography/res-public/values/public.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,37 @@
4646
<public name="textAppearanceLabelMedium" type="attr"/>
4747
<public name="textAppearanceLabelSmall" type="attr"/>
4848

49+
<public name="TextAppearance.Material3.DisplayLarge.Emphasized" type="style"/>
50+
<public name="TextAppearance.Material3.DisplayMedium.Emphasized" type="style"/>
51+
<public name="TextAppearance.Material3.DisplaySmall.Emphasized" type="style"/>
52+
<public name="TextAppearance.Material3.HeadlineLarge.Emphasized" type="style"/>
53+
<public name="TextAppearance.Material3.HeadlineMedium.Emphasized" type="style"/>
54+
<public name="TextAppearance.Material3.HeadlineSmall.Emphasized" type="style"/>
55+
<public name="TextAppearance.Material3.TitleLarge.Emphasized" type="style"/>
56+
<public name="TextAppearance.Material3.TitleMedium.Emphasized" type="style"/>
57+
<public name="TextAppearance.Material3.TitleSmall.Emphasized" type="style"/>
58+
<public name="TextAppearance.Material3.BodyLarge.Emphasized" type="style"/>
59+
<public name="TextAppearance.Material3.BodyMedium.Emphasized" type="style"/>
60+
<public name="TextAppearance.Material3.BodySmall.Emphasized" type="style"/>
61+
<public name="TextAppearance.Material3.LabelLarge.Emphasized" type="style"/>
62+
<public name="TextAppearance.Material3.LabelMedium.Emphasized" type="style"/>
63+
<public name="TextAppearance.Material3.LabelSmall.Emphasized" type="style"/>
64+
<public name="textAppearanceDisplayLargeEmphasized" type="attr"/>
65+
<public name="textAppearanceDisplayMediumEmphasized" type="attr"/>
66+
<public name="textAppearanceDisplaySmallEmphasized" type="attr"/>
67+
<public name="textAppearanceHeadlineLargeEmphasized" type="attr"/>
68+
<public name="textAppearanceHeadlineMediumEmphasized" type="attr"/>
69+
<public name="textAppearanceHeadlineSmallEmphasized" type="attr"/>
70+
<public name="textAppearanceTitleLargeEmphasized" type="attr"/>
71+
<public name="textAppearanceTitleMediumEmphasized" type="attr"/>
72+
<public name="textAppearanceTitleSmallEmphasized" type="attr"/>
73+
<public name="textAppearanceBodyLargeEmphasized" type="attr"/>
74+
<public name="textAppearanceBodyMediumEmphasized" type="attr"/>
75+
<public name="textAppearanceBodySmallEmphasized" type="attr"/>
76+
<public name="textAppearanceLabelLargeEmphasized" type="attr"/>
77+
<public name="textAppearanceLabelMediumEmphasized" type="attr"/>
78+
<public name="textAppearanceLabelSmallEmphasized" type="attr"/>
79+
4980
<public name="TextAppearance.MaterialComponents.Headline1" type="style"/>
5081
<public name="TextAppearance.MaterialComponents.Headline2" type="style"/>
5182
<public name="TextAppearance.MaterialComponents.Headline3" type="style"/>

0 commit comments

Comments
 (0)