summaryrefslogtreecommitdiff
path: root/graphics/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-06-08 17:57:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-06-08 17:57:30 +0000
commit15cc80b39c0da6dd7dd80966b99480d532428d96 (patch)
tree9aa55c063fbaaa52cd386d38b914558257bb9810 /graphics/java
parent0d0d1ae6496d1fbc91dcfbb6cddef065b716d625 (diff)
parent18c044d31b04945e72128c795f8e0ed3b4befc74 (diff)
Merge "Use RobotoStatic-Regular for the weight 400 of roboto family" into sc-dev
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/Typeface.java1
1 files changed, 1 insertions, 0 deletions
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();