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

Commit 1c585440 authored by Edgar Wang's avatar Edgar Wang
Browse files

[Expressive design] apply GSF after sdk 36 

For the AOSP version, the font family will fallback to Roboto
because those tokens are not defined

Bug: 416456263
Test: visual
Flag: EXEMPT resource update
Change-Id: I6b68ee6cf5bca1b1de430cfe54e866e878e15ad1
parent ff5f71d7

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

+318 −0
Original line number Diff line number Diff line
@@ -16,6 +16,324 @@ 
  -->



<resources>

    <style name="TextAppearance.SettingsLib.DisplayLarge"

        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:lineHeight">64sp</item>

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.DisplayMedium"

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

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

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

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

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

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.DisplaySmall"

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

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

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

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

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

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

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

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

    </style>



    <style name="TextAppearance.SettingsLib.HeadlineLarge"

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

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

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

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

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

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.HeadlineMedium"

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

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

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

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

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

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.HeadlineSmall"

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

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

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

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

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

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

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

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

    </style>



    <style name="TextAppearance.SettingsLib.TitleLarge"

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

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

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

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

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

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.TitleMedium"

        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:lineHeight">24sp</item>

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.TitleSmall"

        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:lineHeight">20sp</item>

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

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

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

    </style>



    <style name="TextAppearance.SettingsLib.LabelLarge"

        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:lineHeight">20sp</item>

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.LabelMedium"

        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:lineHeight">16sp</item>

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.LabelSmall"

        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:lineHeight">16sp</item>

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

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

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

    </style>



    <style name="TextAppearance.SettingsLib.BodyLarge"

        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:lineHeight">24sp</item>

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.BodyMedium"

        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:lineHeight">20sp</item>

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.BodySmall"

        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:lineHeight">16sp</item>

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

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

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

    </style>



    <style name="TextAppearance.SettingsLib.DisplayLarge.Emphasized"

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

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

        <item name="android:textSize">57sp</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>

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

    </style>

    <style name="TextAppearance.SettingsLib.DisplayMedium.Emphasized"

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

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

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

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

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

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.DisplaySmall.Emphasized"

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

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

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

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

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

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

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

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

    </style>



    <style name="TextAppearance.SettingsLib.HeadlineLarge.Emphasized"

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

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

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

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

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

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.HeadlineMedium.Emphasized"

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

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

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

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

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

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

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

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

    </style>

    <style name="TextAppearance.SettingsLib.HeadlineSmall.Emphasized"

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

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

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

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

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

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

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

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

    </style>



    <style name="TextAppearance.SettingsLib.TitleLarge.Emphasized"

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

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

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

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

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

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

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

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

    </style>

    <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:lineHeight">24sp</item>

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

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

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

    </style>

    <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:lineHeight">20sp</item>

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

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

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

    </style>



    <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:lineHeight">20sp</item>

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

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

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

    </style>

    <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:lineHeight">16sp</item>

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

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

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

    </style>

    <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:lineHeight">16sp</item>

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

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

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

    </style>



    <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:lineHeight">24sp</item>

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

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

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

    </style>

    <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:lineHeight">20sp</item>

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

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

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

    </style>

    <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:lineHeight">16sp</item>

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

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

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

    </style>



    <style name="SettingslibSwitchStyle.Expressive" parent="">

        <item name="android:layout_width">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>