commit 0fe634737b24fd8f4dc8d0f49eb15ea176242428
author Deepanshu Gupta <deepanshu@google.com> Wed Apr 16 18:36:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 16 18:36:58 2014 +0000
tree 127f576cd8a2c4250f34b129470a7a1aaed67058
parent 87e14187111254b8842193f4f3514c0dea50967d
parent 04b4f8d11406c64b94797af67dd7530435187129

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

* commit '04b4f8d11406c64b94797af67dd7530435187129':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]

tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java

diff --git a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
index 8701cc8..b50e98b8 100644
--- a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
@@ -103,6 +103,9 @@
         if (familyName == null) {
             familyName = DEFAULT_FAMILY;
         }
+        if (style < 0) {
+            style = Typeface.NORMAL;
+        }
 
         Typeface_Delegate newDelegate = new Typeface_Delegate(familyName, style);
         if (sFontLoader != null) {