diff options
| author | 2017-07-25 18:19:24 +0000 | |
|---|---|---|
| committer | 2017-07-25 18:19:24 +0000 | |
| commit | b63b0114193f732d6d31897fe74eaf05618dea3d (patch) | |
| tree | 3556efbf1014f588261a0e0c75dcaf19b1898b8c | |
| parent | 5c6c7586cdd000b400336fe8fc91404b35d43fd5 (diff) | |
| parent | 29a9bfc506d74c9b0298d726209905680593ff36 (diff) | |
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res-keyguard/values/styles.xml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 8c18dd6e7f30..7819f3032cb3 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2981,6 +2981,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 c6f942356833..4f8214769445 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"> |