Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev am: b63b011419 am: 404f96719d
am: c756ca2577
Change-Id: I343d200b87ed8dfc4bd8cc04b5a33a5f0d42ea06
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index bc02ea0..27d55ba 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3008,6 +3008,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">
diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
index c6f9423..4f82147 100644
--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -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">