Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b2b5e21 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] update letter spacing of TextAppearance" into main

parents 35664fa3 292de77d

packages/SettingsLib/SettingsTheme/res/values-v33/styles_expressive.xml

+17 −17
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <style name="TextAppearance.SettingsLib.DisplayLarge"

        parent="@android:style/TextAppearance.DeviceDefault.Headline">

        <item name="android:textSize">57sp</item>

        <item name="android:letterSpacing">-0.00438596</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">64sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -84,7 +84,7 @@ 
    <style name="TextAppearance.SettingsLib.TitleMedium"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.009375</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">24sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -93,7 +93,7 @@ 
    <style name="TextAppearance.SettingsLib.TitleSmall"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -103,7 +103,7 @@ 
    <style name="TextAppearance.SettingsLib.LabelLarge"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -112,7 +112,7 @@ 
    <style name="TextAppearance.SettingsLib.LabelMedium"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.04166667</item>

        <item name="android:letterSpacing">0.00833333</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -121,7 +121,7 @@ 
    <style name="TextAppearance.SettingsLib.LabelSmall"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">11sp</item>

        <item name="android:letterSpacing">0.04545455</item>

        <item name="android:letterSpacing">0.00909091</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -131,7 +131,7 @@ 
    <style name="TextAppearance.SettingsLib.BodyLarge"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.03125</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">24sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -140,7 +140,7 @@ 
    <style name="TextAppearance.SettingsLib.BodyMedium"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.01785714</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -149,7 +149,7 @@ 
    <style name="TextAppearance.SettingsLib.BodySmall"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.03333333</item>

        <item name="android:letterSpacing">0.00833333</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -225,7 +225,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.009375</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">24sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -235,7 +235,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -246,7 +246,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -256,7 +256,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.04166667</item>

        <item name="android:letterSpacing">0.00833333</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -266,7 +266,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">11sp</item>

        <item name="android:letterSpacing">0.04545455</item>

        <item name="android:letterSpacing">0.00909091</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -277,7 +277,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textStyle">normal</item>

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.009375</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">24sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -287,7 +287,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textStyle">normal</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.01785714</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -297,7 +297,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textStyle">normal</item>

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.03333333</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>

packages/SettingsLib/SettingsTheme/res/values-v36/styles_expressive.xml

+17 −25
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Headline">

        <item name="android:fontFamily">variable-display-large</item>

        <item name="android:textSize">57sp</item>

        <item name="android:letterSpacing">-0.00438596</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">64sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -92,7 +92,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:fontFamily">variable-title-medium</item>

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.009375</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">24sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -102,7 +102,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:fontFamily">variable-title-small</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -113,7 +113,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:fontFamily">variable-label-large</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -123,7 +123,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:fontFamily">variable-label-medium</item>

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.04166667</item>

        <item name="android:letterSpacing">0.00833333</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -133,7 +133,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:fontFamily">variable-label-small</item>

        <item name="android:textSize">11sp</item>

        <item name="android:letterSpacing">0.04545455</item>

        <item name="android:letterSpacing">0.00909091</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -144,7 +144,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:fontFamily">variable-body-large</item>

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.03125</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">24sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -154,7 +154,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:fontFamily">variable-body-medium</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.01785714</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -164,7 +164,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:fontFamily">variable-body-small</item>

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.03333333</item>

        <item name="android:letterSpacing">0.00833333</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -246,9 +246,8 @@ 
    <style name="TextAppearance.SettingsLib.TitleMedium.Emphasized"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:fontFamily">variable-title-medium-emphasized</item>

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.009375</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">24sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -257,9 +256,8 @@ 
    <style name="TextAppearance.SettingsLib.TitleSmall.Emphasized"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:fontFamily">variable-title-small-emphasized</item>

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -269,9 +267,8 @@ 
    <style name="TextAppearance.SettingsLib.LabelLarge.Emphasized"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:fontFamily">variable-label-large-emphasized</item>

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -280,9 +277,8 @@ 
    <style name="TextAppearance.SettingsLib.LabelMedium.Emphasized"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:fontFamily">variable-label-medium-emphasized</item>

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.04166667</item>

        <item name="android:letterSpacing">0.00833333</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -291,9 +287,8 @@ 
    <style name="TextAppearance.SettingsLib.LabelSmall.Emphasized"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:fontFamily">variable-label-small-emphasized</item>

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">11sp</item>

        <item name="android:letterSpacing">0.04545455</item>

        <item name="android:letterSpacing">0.00909091</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -303,9 +298,8 @@ 
    <style name="TextAppearance.SettingsLib.BodyLarge.Emphasized"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:fontFamily">variable-body-large-emphasized</item>

        <item name="android:textStyle">normal</item>

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.009375</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">24sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -314,9 +308,8 @@ 
    <style name="TextAppearance.SettingsLib.BodyMedium.Emphasized"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:fontFamily">variable-body-medium-emphasized</item>

        <item name="android:textStyle">normal</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.01785714</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">20sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>
@@ -325,9 +318,8 @@ 
    <style name="TextAppearance.SettingsLib.BodySmall.Emphasized"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:fontFamily">variable-body-small-emphasized</item>

        <item name="android:textStyle">normal</item>

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.03333333</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight">16sp</item>

        <item name="android:hyphenationFrequency">normalFast</item>

        <item name="android:lineBreakWordStyle">phrase</item>

packages/SettingsLib/SettingsTheme/res/values/styles_expressive.xml

+17 −17
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>

        <item name="android:textSize">57sp</item>

        <item name="android:letterSpacing">-0.00438596</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">64sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -77,14 +77,14 @@ 
    <style name="TextAppearance.SettingsLib.TitleMedium"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.009375</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">24sp</item>

        <item name="android:textAllCaps">false</item>

    </style>

    <style name="TextAppearance.SettingsLib.TitleSmall"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">20sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -92,21 +92,21 @@ 
    <style name="TextAppearance.SettingsLib.LabelLarge"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">20sp</item>

        <item name="android:textAllCaps">false</item>

    </style>

    <style name="TextAppearance.SettingsLib.LabelMedium"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.04166667</item>

        <item name="android:letterSpacing">0.00833333</item>

        <item name="android:lineHeight" tools:targetApi="28">16sp</item>

        <item name="android:textAllCaps">false</item>

    </style>

    <style name="TextAppearance.SettingsLib.LabelSmall"

        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textSize">11sp</item>

        <item name="android:letterSpacing">0.04545455</item>

        <item name="android:letterSpacing">0.00909091</item>

        <item name="android:lineHeight" tools:targetApi="28">16sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -114,21 +114,21 @@ 
    <style name="TextAppearance.SettingsLib.BodyLarge"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.03125</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">24sp</item>

        <item name="android:textAllCaps">false</item>

    </style>

    <style name="TextAppearance.SettingsLib.BodyMedium"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.01785714</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">20sp</item>

        <item name="android:textAllCaps">false</item>

    </style>

    <style name="TextAppearance.SettingsLib.BodySmall"

        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.03333333</item>

        <item name="android:letterSpacing">0.00833333</item>

        <item name="android:lineHeight" tools:targetApi="28">16sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -188,7 +188,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.009375</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">24sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -196,7 +196,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">20sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -205,7 +205,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.00714286</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">20sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -213,7 +213,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.04166667</item>

        <item name="android:letterSpacing">0.00833333</item>

        <item name="android:lineHeight" tools:targetApi="28">16sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -221,7 +221,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:textStyle">bold</item>

        <item name="android:textSize">11sp</item>

        <item name="android:letterSpacing">0.04545455</item>

        <item name="android:letterSpacing">0.00909091</item>

        <item name="android:lineHeight" tools:targetApi="28">16sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -230,7 +230,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textStyle">normal</item>

        <item name="android:textSize">16sp</item>

        <item name="android:letterSpacing">0.009375</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">24sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -238,7 +238,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textStyle">normal</item>

        <item name="android:textSize">14sp</item>

        <item name="android:letterSpacing">0.01785714</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">20sp</item>

        <item name="android:textAllCaps">false</item>

    </style>
@@ -246,7 +246,7 @@ 
        parent="@android:style/TextAppearance.DeviceDefault.Medium">

        <item name="android:textStyle">normal</item>

        <item name="android:textSize">12sp</item>

        <item name="android:letterSpacing">0.03333333</item>

        <item name="android:letterSpacing">0</item>

        <item name="android:lineHeight" tools:targetApi="28">16sp</item>

        <item name="android:textAllCaps">false</item>

    </style>