Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4932cd5f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14722633

Change-Id: I165a80e4283a076c8fdc655aa0b386eafcfc32e1
parents 9872e0f7 15cc80b3

data/fonts/fonts.xml

+1 −5
Original line number Original line Diff line number Diff line
@@ -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" />

graphics/java/android/graphics/Typeface.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -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();