Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set default text style in layoutlib as NORMAL [DO NOT MERGE]

Browse Source 
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.

Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry-picked from c63e87d53d)
This commit is contained in:
Deepanshu Gupta
2014-02-19 11:05:02 -08:00
parent 5be65fda15
commit bcbeaf83ca
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java
View File

@@ -103,6 +103,9 @@ public final class Typeface_Delegate {
if (familyName == null) { if (familyName == null) {
familyName = DEFAULT_FAMILY; familyName = DEFAULT_FAMILY;
} }
if (style < 0) {
style = Typeface.NORMAL;
}
Typeface_Delegate newDelegate = new Typeface_Delegate(familyName, style); Typeface_Delegate newDelegate = new Typeface_Delegate(familyName, style);
if (sFontLoader != null) { if (sFontLoader != null) {