drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev

Browse Source 
* commit '2cb9147fc49e6474eaf30fd833e43df10e42b899':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
This commit is contained in:
Xavier Ducrohet
2014-02-20 17:49:32 +00:00
committed by Android Git Automerger
parent 65521c3cf1 2cb9147fc4
commit 9edf7a1159
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
View File

@ -103,6 +103,9 @@ public final class Typeface_Delegate {
if (familyName == null) { if (familyName == null) {
familyName = DEFAULT_FAMILY; familyName = DEFAULT_FAMILY;
} }
if (style < 0) {
style = Typeface.NORMAL;
}
Typeface_Delegate newDelegate = new Typeface_Delegate(familyName, style); Typeface_Delegate newDelegate = new Typeface_Delegate(familyName, style);
if (sFontLoader != null) { if (sFontLoader != null) {