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

Commit af461e12 authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev

parents 5df10e18 42b3024e

core/java/android/widget/TextView.java

+5 −0
Original line number Diff line number Diff line
@@ -658,6 +658,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        ColorStateList textColorLink = null;

        int textSize = 15;

        String fontFamily = null;

        boolean fontFamilyExplicit = false;

        int typefaceIndex = -1;

        int styleIndex = -1;

        boolean allCaps = false;
@@ -1012,6 +1013,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


            case com.android.internal.R.styleable.TextView_fontFamily:

                fontFamily = a.getString(attr);

                fontFamilyExplicit = true;

                break;



            case com.android.internal.R.styleable.TextView_password:
@@ -1300,6 +1302,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            typefaceIndex = MONOSPACE;

        }



        if (typefaceIndex != -1 && !fontFamilyExplicit) {

            fontFamily = null;

        }

        setTypefaceFromAttrs(fontFamily, typefaceIndex, styleIndex);



        if (shadowcolor != 0) {