Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use RobotoStatic-Regular for the weight 400 of roboto family" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-08 17:57:30 +00:00
committed by Android (Google) Code Review
parent 0d0d1ae649 18c044d31b
commit 15cc80b39c
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/fonts/fonts.xml
View File

@@ -39,11 +39,7 @@
<axis tag="wdth" stylevalue="100" /> <axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="300" /> <axis tag="wght" stylevalue="300" />
</font> </font>
<font weight="400" style="normal">Roboto-Regular.ttf <font weight="400" style="normal">RobotoStatic-Regular.ttf</font>
<axis tag="ital" stylevalue="0" />
<axis tag="wdth" stylevalue="100" />
<axis tag="wght" stylevalue="400" />
</font>
<font weight="500" style="normal">Roboto-Regular.ttf <font weight="500" style="normal">Roboto-Regular.ttf
<axis tag="ital" stylevalue="0" /> <axis tag="ital" stylevalue="0" />
<axis tag="wdth" stylevalue="100" /> <axis tag="wdth" stylevalue="100" />

1
graphics/java/android/graphics/Typeface.java
View File

@@ -1387,6 +1387,7 @@ public class Typeface {
static { static {
// Preload Roboto-Regular.ttf in Zygote for improving app launch performance. // Preload Roboto-Regular.ttf in Zygote for improving app launch performance.
preloadFontFile("/system/fonts/Roboto-Regular.ttf"); preloadFontFile("/system/fonts/Roboto-Regular.ttf");
preloadFontFile("/system/fonts/RobotoStatic-Regular.ttf");
String locale = SystemProperties.get("persist.sys.locale", "en-US"); String locale = SystemProperties.get("persist.sys.locale", "en-US");
String script = ULocale.addLikelySubtags(ULocale.forLanguageTag(locale)).getScript(); String script = ULocale.addLikelySubtags(ULocale.forLanguageTag(locale)).getScript();