diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-02-20 17:53:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 17:53:20 +0000 |
| commit | 21c5c8e600d635df1d5bbfb9f4db6d0f60b9e2ad (patch) | |
| tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 /tools | |
| parent | c139177b13427ea3ea1bc88364136439125848af (diff) | |
| parent | 9edf7a1159b528afa056e0d61ee4487ed310fe4c (diff) | |
| download | frameworks_base-21c5c8e600d635df1d5bbfb9f4db6d0f60b9e2ad.zip frameworks_base-21c5c8e600d635df1d5bbfb9f4db6d0f60b9e2ad.tar.gz frameworks_base-21c5c8e600d635df1d5bbfb9f4db6d0f60b9e2ad.tar.bz2 | |
am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '9edf7a1159b528afa056e0d61ee4487ed310fe4c':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Diffstat (limited to 'tools')
| -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 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 @@ 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) { |