diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-02-20 17:41:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-20 17:41:08 +0000 |
| commit | 3e6370425ea3ac4e5d89ce042512913062212ccc (patch) | |
| tree | 1ca4107d175ed09bd0f80397a96afcdc094876e5 | |
| parent | 01825b7aa3c864426c78c08c2f6004a8362c2b47 (diff) | |
| parent | 13aea18b34e527cffeaa6cb81f5ecb7c4a66cb11 (diff) | |
| download | frameworks_base-3e6370425ea3ac4e5d89ce042512913062212ccc.zip frameworks_base-3e6370425ea3ac4e5d89ce042512913062212ccc.tar.gz frameworks_base-3e6370425ea3ac4e5d89ce042512913062212ccc.tar.bz2 | |
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
| -rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java index 8701cc8..b50e98b 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 @@ 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) { |