diff options
| author | 2021-06-08 17:57:30 +0000 | |
|---|---|---|
| committer | 2021-06-08 17:57:30 +0000 | |
| commit | 15cc80b39c0da6dd7dd80966b99480d532428d96 (patch) | |
| tree | 9aa55c063fbaaa52cd386d38b914558257bb9810 | |
| parent | 0d0d1ae6496d1fbc91dcfbb6cddef065b716d625 (diff) | |
| parent | 18c044d31b04945e72128c795f8e0ed3b4befc74 (diff) | |
Merge "Use RobotoStatic-Regular for the weight 400 of roboto family" into sc-dev
| -rw-r--r-- | data/fonts/fonts.xml | 6 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Typeface.java | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index 11635366a222..d757a8c75a80 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -39,11 +39,7 @@ <axis tag="wdth" stylevalue="100" /> <axis tag="wght" stylevalue="300" /> </font> - <font weight="400" style="normal">Roboto-Regular.ttf - <axis tag="ital" stylevalue="0" /> - <axis tag="wdth" stylevalue="100" /> - <axis tag="wght" stylevalue="400" /> - </font> + <font weight="400" style="normal">RobotoStatic-Regular.ttf</font> <font weight="500" style="normal">Roboto-Regular.ttf <axis tag="ital" stylevalue="0" /> <axis tag="wdth" stylevalue="100" /> diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index b88751a610dd..61f7facf0916 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -1387,6 +1387,7 @@ public class Typeface { static { // Preload Roboto-Regular.ttf in Zygote for improving app launch performance. preloadFontFile("/system/fonts/Roboto-Regular.ttf"); + preloadFontFile("/system/fonts/RobotoStatic-Regular.ttf"); String locale = SystemProperties.get("persist.sys.locale", "en-US"); String script = ULocale.addLikelySubtags(ULocale.forLanguageTag(locale)).getScript(); |