commit 9edf7a1159b528afa056e0d61ee4487ed310fe4c
author Xavier Ducrohet <xav@google.com> Thu Feb 20 17:49:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 20 17:49:32 2014 +0000
tree 693a938d06c7cc9157dab1d9bc88ca7dc243905d
parent 65521c3cf169808cd02ce09a7344bc633d51c1fc
parent 2cb9147fc49e6474eaf30fd833e43df10e42b899

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

* commit '2cb9147fc49e6474eaf30fd833e43df10e42b899':
  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 a25fb59..60cd157 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) {