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

Commit 7c9e897c authored by Clara Bayarri's avatar Clara Bayarri Committed by Android (Google) Code Review
Browse files

Merge "Fix textStyle being ignored for Font resources in TextView"

parents 81b034d4 576ee7de

core/java/android/widget/TextView.java

+2 −0
Original line number Diff line number Diff line
@@ -2031,6 +2031,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        Typeface tf = fontTypeface;

        if (tf == null && familyName != null) {

            tf = Typeface.create(familyName, styleIndex);

        } else if (tf != null && tf.getStyle() != styleIndex) {

            tf = Typeface.create(tf, styleIndex);

        }

        if (tf != null) {

            setTypeface(tf);