Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev

2014-02-20 17:41:07 +00:00
parent 01825b7aa3 13aea18b34
commit 3e6370425e
1 changed files with 3 additions and 0 deletions
--- a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
@@ -103,6 +103,9 @@ public final class Typeface_Delegate {
        if (familyName == null) {
            familyName = DEFAULT_FAMILY;
        }
+        if (style < 0) {
+            style = Typeface.NORMAL;
+        }

        Typeface_Delegate newDelegate = new Typeface_Delegate(familyName, style);
        if (sFontLoader != null) {