Merge "Implement family fallback."

This commit is contained in:
Seigo Nonaka
2017-07-13 20:02:29 +00:00
committed by Android (Google) Code Review
15 changed files with 1688 additions and 209 deletions

View File

@@ -64,17 +64,19 @@ public final class FontConfig {
private final int mWeight;
private final boolean mIsItalic;
private Uri mUri;
private final String mFallbackFor;
/**
* @hide
*/
public Font(@NonNull String fontName, int ttcIndex, @NonNull FontVariationAxis[] axes,
int weight, boolean isItalic) {
int weight, boolean isItalic, String fallbackFor) {
mFontName = fontName;
mTtcIndex = ttcIndex;
mAxes = axes;
mWeight = weight;
mIsItalic = isItalic;
mFallbackFor = fallbackFor;
}
/**
@@ -125,6 +127,10 @@ public final class FontConfig {
public void setUri(@NonNull Uri uri) {
mUri = uri;
}
public String getFallbackFor() {
return mFallbackFor;
}
}
/**