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