Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make TextAppearance.DeviceDefault.Headline public."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-06 20:33:36 +00:00
committed by Android (Google) Code Review
parent d9bdab733f 09e9a3b39c
commit 4304ac0abc
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -2258,6 +2258,7 @@ package android {
field public static final int TextAppearance = 16973886; // 0x103003e
field public static final int TextAppearance_DeviceDefault = 16974253; // 0x10301ad
field public static final int TextAppearance_DeviceDefault_DialogWindowTitle = 16974264; // 0x10301b8
field public static final int TextAppearance_DeviceDefault_Headline;
field public static final int TextAppearance_DeviceDefault_Inverse = 16974254; // 0x10301ae
field public static final int TextAppearance_DeviceDefault_Large = 16974255; // 0x10301af
field public static final int TextAppearance_DeviceDefault_Large_Inverse = 16974256; // 0x10301b0

1
core/res/res/values/public.xml
View File

@@ -3263,6 +3263,7 @@
</staging-public-group>
<staging-public-group type="style" first-id="0x01dd0000">
<public name="TextAppearance.DeviceDefault.Headline" />
</staging-public-group>
<staging-public-group type="string" first-id="0x01dc0000">

2
core/res/res/values/styles_device_defaults.xml
View File

@@ -398,7 +398,7 @@ easier.
<item name="fontFamily">@string/config_bodyFontFamily</item>
</style>
<style name="TextAppearance.DeviceDefault.Headline" parent="TextAppearance.Material.Headline">
<item name="fontFamily">@string/config_bodyFontFamily</item>
<item name="fontFamily">@string/config_headlineFontFamily</item>
</style>
<style name="TextAppearance.DeviceDefault.Display1" parent="TextAppearance.Material.Display1">
<item name="fontFamily">@string/config_bodyFontFamily</item>