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

am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev

Browse Source 
* commit '0fe634737b24fd8f4dc8d0f49eb15ea176242428':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-04-16 18:40:37 +00:00
committed by Android Git Automerger
parent 4eeaa61f6b 0fe634737b
commit 00312846e1
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) {