diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-02 19:24:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 19:24:17 +0000 |
| commit | 9e2dadaee0d04b43cf41ed32b4a9ec59503f4477 (patch) | |
| tree | 7781385f4b15e948ba69b13c566d77a59dba73bc | |
| parent | cf3f108ee30609198734d386bcfcf35dbfcf5b53 (diff) | |
| parent | bcbeaf83ca75e4a819377938fdf3ec1e07fa30a7 (diff) | |
| download | frameworks_base-9e2dadaee0d04b43cf41ed32b4a9ec59503f4477.zip frameworks_base-9e2dadaee0d04b43cf41ed32b4a9ec59503f4477.tar.gz frameworks_base-9e2dadaee0d04b43cf41ed32b4a9ec59503f4477.tar.bz2 | |
am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit 'bcbeaf83ca75e4a819377938fdf3ec1e07fa30a7':
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 2414d70..9b291cf 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) { |