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

Commit 2a7356e3 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev

am: b63b0114

Change-Id: I98ef598ca3260328cb65f2c619767acb61759a14
parents f7fd8bb2 b63b0114
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -2970,6 +2970,8 @@
    <string name="config_headlineFontFamily" translatable="false"></string>
    <!-- Name of a font family to use for headlines. Defaults to sans-serif-light -->
    <string name="config_headlineFontFamilyLight" translatable="false">sans-serif-light</string>
    <!-- Allows setting custom fontFeatureSettings on specific text. -->
    <string name="config_headlineFontFeatureSettings" translatable="false"></string>

    <!-- An array of packages that need to be treated as type system in battery settings -->
    <string-array translatable="false" name="config_batteryPackageTypeSystem">
+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@
    <style name="widget_big_thin">
        <item name="android:textSize">@dimen/widget_big_font_size</item>
        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
        <item name="android:fontFeatureSettings">@*android:string/config_headlineFontFeatureSettings</item>
    </style>

    <style name="BouncerSecurityContainer">