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

Update FontFamily_Delegate following Change I1d6e1c4c

Browse Source 
Test: layoutlib tests
Change-Id: I3fda9b0eaf36d74c8a64f2a5c7aeb063b4df8d1a
This commit is contained in:
Jerome Gaillard
2017-02-17 15:46:05 +00:00
parent bae3d7083f
commit 1db0d3cd04
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
View File

@@ -314,7 +314,7 @@ public class FontFamily_Delegate {
@LayoutlibDelegate
/*package*/ static boolean nAddFontFromAssetManager(long builderPtr, AssetManager mgr, String path,
int cookie, boolean isAsset) {
int cookie, boolean isAsset, int weight, boolean isItalic) {
FontFamily_Delegate ffd = sManager.getDelegate(builderPtr);
if (ffd == null) {
return false;
@@ -355,8 +355,12 @@ public class FontFamily_Delegate {
Font font = Font.createFont(Font.TRUETYPE_FONT, fontStream);
fontInfo = new FontInfo();
fontInfo.mFont = font;
fontInfo.mWeight = font.isBold() ? BOLD_FONT_WEIGHT : DEFAULT_FONT_WEIGHT;
fontInfo.mIsItalic = font.isItalic();
if (weight == 0) {
fontInfo.mWeight = font.isBold() ? BOLD_FONT_WEIGHT : DEFAULT_FONT_WEIGHT;
} else {
fontInfo.mWeight = weight;
}
fontInfo.mIsItalic = weight == 0 ? font.isItalic() : isItalic;
ffd.addFont(fontInfo);
return true;
} catch (IOException e) {