commit | 04b4f8d11406c64b94797af67dd7530435187129 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Wed Apr 16 18:34:04 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 16 18:34:04 2014 +0000 |
tree | 28f21f6ac27c5b9abb062eeeb8ed27f333263d22 | |
parent | fb120acd841f7d8d0e1845f5bdd98abf35cb25b4 [diff] | |
parent | c63e87d53deb24c4286036313db11719173419b3 [diff] |
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
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) {