diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-02-19 20:16:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-19 20:16:09 +0000 |
| commit | be727079a5b4f9a5b485d6763d38f5720a44f10f (patch) | |
| tree | ab47c83cc78757e623c7131358fee44af7b04480 /tools/layoutlib | |
| parent | d3f8e8709eaed307a06a7f7c6d7682e7abbb004b (diff) | |
| parent | 0acfb16dcd95468fe032204f54618e86becfd1eb (diff) | |
| download | frameworks_base-be727079a5b4f9a5b485d6763d38f5720a44f10f.zip frameworks_base-be727079a5b4f9a5b485d6763d38f5720a44f10f.tar.gz frameworks_base-be727079a5b4f9a5b485d6763d38f5720a44f10f.tar.bz2 | |
Merge "Set default text style in layoutlib as NORMAL"
Diffstat (limited to 'tools/layoutlib')
| -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) { |