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

Commit b01d3db7 authored by Jerome Gaillard's avatar Jerome Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Update FontFamily_Delegate following Change I1d6e1c4c"

parents 82c2d94e 1db0d3cd

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

+7 −3
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ public class FontFamily_Delegate { 


    @LayoutlibDelegate

    /*package*/ static boolean nAddFontFromAssetManager(long builderPtr, AssetManager mgr, String path,

            int cookie, boolean isAsset) {

            int cookie, boolean isAsset, int weight, boolean isItalic) {

        FontFamily_Delegate ffd = sManager.getDelegate(builderPtr);

        if (ffd == null) {

            return false;
@@ -355,8 +355,12 @@ public class FontFamily_Delegate { 
                Font font = Font.createFont(Font.TRUETYPE_FONT, fontStream);

                fontInfo = new FontInfo();

                fontInfo.mFont = font;

                if (weight == 0) {

                    fontInfo.mWeight = font.isBold() ? BOLD_FONT_WEIGHT : DEFAULT_FONT_WEIGHT;

                fontInfo.mIsItalic = font.isItalic();

                } else {

                    fontInfo.mWeight = weight;

                }

                fontInfo.mIsItalic = weight == 0 ? font.isItalic() : isItalic;

                ffd.addFont(fontInfo);

                return true;

            } catch (IOException e) {