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

Commit 71893bdf authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Overlay font working on Keyguard/QS/Notification"

parents 0f2740a5 8a7a334a

core/res/res/values/styles_device_defaults.xml

+9 −1
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ easier. 
        <item name="textAppearance">?attr/textAppearanceButton</item>

        <item name="textColor">@color/btn_colored_text_material</item>

    </style>

    <style name="Widget.DeviceDefault.TextView" parent="Widget.Material.TextView"/>

    <style name="Widget.DeviceDefault.TextView" parent="Widget.Material.TextView">

        <item name="textAppearance">@string/config_bodyFontFamily</item>

    </style>

    <style name="Widget.DeviceDefault.CheckedTextView" parent="Widget.Material.CheckedTextView"/>

    <style name="Widget.DeviceDefault.AutoCompleteTextView" parent="Widget.Material.AutoCompleteTextView"/>

    <style name="Widget.DeviceDefault.CompoundButton.CheckBox" parent="Widget.Material.CompoundButton.CheckBox"/>
@@ -266,6 +268,12 @@ easier. 
    <style name="TextAppearance.DeviceDefault.Notification.Reply" parent="TextAppearance.Material.Notification.Reply">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Info" parent="TextAppearance.Material.Notification.Info">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Info.Ambient" parent="TextAppearance.Material.Notification.Info.Ambient">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget" parent="TextAppearance.Material.Widget">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

core/res/res/values/themes_device_defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -1705,9 +1705,11 @@ easier. 
    </style>



    <style name="Theme.DeviceDefault.Notification" parent="@style/Theme.Material.Notification">

        <item name="notificationHeaderTextAppearance">@style/TextAppearance.DeviceDefault.Notification.Info</item>

    </style>



    <style name="Theme.DeviceDefault.Notification.Ambient" parent="@style/Theme.Material.Notification.Ambient">

        <item name="notificationHeaderTextAppearance">@style/TextAppearance.DeviceDefault.Notification.Info.Ambient</item>

    </style>



</resources>

packages/SystemUI/res-keyguard/layout/keyguard_clock_switch.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:letterSpacing="0.03"

        android:textColor="?attr/wallpaperTextColor"

        android:singleLine="true"

        style="@style/widget_big_thin"

        style="@style/widget_big"

        android:format12Hour="@string/keyguard_widget_12_hours_format"

        android:format24Hour="@string/keyguard_widget_24_hours_format" />

</com.android.keyguard.KeyguardClockSwitch>

packages/SystemUI/res-keyguard/layout/keyguard_status_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
            android:paddingLeft="@dimen/logout_button_padding_horizontal"

            android:paddingRight="@dimen/logout_button_padding_horizontal"

            android:background="@drawable/logout_button_background"

            android:fontFamily="roboto-medium"

            android:fontFamily="@*android:string/config_bodyFontFamilyMedium"

            android:textAllCaps="true"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="13sp"

packages/SystemUI/res-keyguard/values/styles.xml

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
    </style>

    <style name="Widget.TextView.NumPadKey.Klondike" parent="Widget.TextView.NumPadKey">

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

        <item name="android:fontFamily">sans-serif</item>

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

        <item name="android:textColor">?attr/wallpaperTextColorSecondary</item>

        <item name="android:paddingBottom">0dp</item>

    </style>
@@ -59,10 +59,10 @@ 
    <style name="widget_label">

        <item name="android:textSize">@dimen/widget_label_font_size</item>

    </style>

    <style name="widget_big_thin">

    <style name="widget_big">

        <item name="android:textSize">@dimen/widget_big_font_size</item>

        <item name="android:paddingBottom">@dimen/bottom_text_spacing_digital</item>

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

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

        <item name="android:fontFeatureSettings">@*android:string/config_headlineFontFeatureSettings</item>

        <item name="android:ellipsize">none</item>

    </style>
@@ -93,7 +93,7 @@ 
        <item name="android:gravity">center</item>

        <item name="android:ellipsize">end</item>

        <item name="android:maxLines">2</item>

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

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

    </style>



    <style name="TextAppearance.Keyguard.Secondary">