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

Commit 74fe1c50 authored by Diego Perez's avatar Diego Perez Committed by android-build-merger
Browse files

Merge "Fix fonts following 455f1bfc" into oc-dev 

am: 3b36051c

Change-Id: I802db3a0b82334bf214e2d887b3e7c83a39efdb4
parents 850f8e08 3b36051c

tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java

+2 −1
Original line number Diff line number Diff line
@@ -233,7 +233,8 @@ public final class Typeface_Delegate { 
            Map<String, ByteBuffer> bufferForPath) {

        FontFamily fontFamily = new FontFamily(family.getLanguage(), family.getVariant());

        for (FontConfig.Font font : family.getFonts()) {

            FontFamily_Delegate.addFont(fontFamily.mBuilderPtr, font.getFontName(),

            String fullPathName = "/system/fonts/" + font.getFontName();

            FontFamily_Delegate.addFont(fontFamily.mBuilderPtr, fullPathName,

                    font.getWeight(), font.isItalic());

        }

        fontFamily.freeze();