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

Commit 2ed9a7e5 authored by Raph Levien's avatar Raph Levien Committed by Android Git Automerger
Browse files

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

* commit 'af461e12':
  Refine resolution order for typeface and fontFamily
parents 60e4edfb af461e12

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) {