Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Raph Levien
2015-01-29 22:10:59 +00:00
committed by Android (Google) Code Review
parent 5df10e1842 42b3024efd
commit af461e12a1
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/TextView.java
View File

@@ -658,6 +658,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
ColorStateList textColorLink = null; ColorStateList textColorLink = null;
int textSize = 15; int textSize = 15;
String fontFamily = null; String fontFamily = null;
boolean fontFamilyExplicit = false;
int typefaceIndex = -1; int typefaceIndex = -1;
int styleIndex = -1; int styleIndex = -1;
boolean allCaps = false; boolean allCaps = false;
@@ -1012,6 +1013,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
case com.android.internal.R.styleable.TextView_fontFamily: case com.android.internal.R.styleable.TextView_fontFamily:
fontFamily = a.getString(attr); fontFamily = a.getString(attr);
fontFamilyExplicit = true;
break; break;
case com.android.internal.R.styleable.TextView_password: case com.android.internal.R.styleable.TextView_password:
@@ -1300,6 +1302,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
typefaceIndex = MONOSPACE; typefaceIndex = MONOSPACE;
} }
if (typefaceIndex != -1 && !fontFamilyExplicit) {
fontFamily = null;
}
setTypefaceFromAttrs(fontFamily, typefaceIndex, styleIndex); setTypefaceFromAttrs(fontFamily, typefaceIndex, styleIndex);
if (shadowcolor != 0) { if (shadowcolor != 0) {