diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-02-20 17:42:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 17:42:58 +0000 |
| commit | 55542ee6449bd580f61bc005726b5c87773fbe25 (patch) | |
| tree | 2bfa2c18b11c19595086ee509e59012739aa4c09 | |
| parent | e92c8542a5cf1160a1b701b9f176af64ba46d68d (diff) | |
| parent | 3e6370425ea3ac4e5d89ce042512913062212ccc (diff) | |
| download | frameworks_base-55542ee6449bd580f61bc005726b5c87773fbe25.zip frameworks_base-55542ee6449bd580f61bc005726b5c87773fbe25.tar.gz frameworks_base-55542ee6449bd580f61bc005726b5c87773fbe25.tar.bz2 | |
am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '3e6370425ea3ac4e5d89ce042512913062212ccc':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| -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) { |