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