diff options
-rw-r--r-- | api/current.txt | 5 | ||||
-rw-r--r-- | api/system-current.txt | 5 | ||||
-rw-r--r-- | api/test-current.txt | 5 | ||||
-rw-r--r-- | core/java/android/text/FontConfig.java | 148 | ||||
-rw-r--r-- | graphics/java/android/graphics/fonts/FontVariationAxis.java | 37 |
5 files changed, 8 insertions, 192 deletions
diff --git a/api/current.txt b/api/current.txt index 8ef5f5e14a6b..c52608afb39c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14389,15 +14389,12 @@ package android.graphics.fonts { field public static final android.os.Parcelable.Creator<android.graphics.fonts.FontRequest> CREATOR; } - public final class FontVariationAxis implements android.os.Parcelable { + public final class FontVariationAxis { ctor public FontVariationAxis(java.lang.String, float) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; - method public int describeContents(); method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; method public float getStyleValue(); method public java.lang.String getTag(); method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.graphics.fonts.FontVariationAxis> CREATOR; } public static class FontVariationAxis.InvalidFormatException extends java.lang.Exception { diff --git a/api/system-current.txt b/api/system-current.txt index 95314ecb75ec..5e0f43a7eb6f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -15155,15 +15155,12 @@ package android.graphics.fonts { field public static final android.os.Parcelable.Creator<android.graphics.fonts.FontRequest> CREATOR; } - public final class FontVariationAxis implements android.os.Parcelable { + public final class FontVariationAxis { ctor public FontVariationAxis(java.lang.String, float) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; - method public int describeContents(); method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; method public float getStyleValue(); method public java.lang.String getTag(); method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.graphics.fonts.FontVariationAxis> CREATOR; } public static class FontVariationAxis.InvalidFormatException extends java.lang.Exception { diff --git a/api/test-current.txt b/api/test-current.txt index 3c9b70b2bfda..10871088ac78 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -14441,15 +14441,12 @@ package android.graphics.fonts { field public static final android.os.Parcelable.Creator<android.graphics.fonts.FontRequest> CREATOR; } - public final class FontVariationAxis implements android.os.Parcelable { + public final class FontVariationAxis { ctor public FontVariationAxis(java.lang.String, float) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; - method public int describeContents(); method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; method public float getStyleValue(); method public java.lang.String getTag(); method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.graphics.fonts.FontVariationAxis> CREATOR; } public static class FontVariationAxis.InvalidFormatException extends java.lang.Exception { diff --git a/core/java/android/text/FontConfig.java b/core/java/android/text/FontConfig.java index 8537d8f1ea84..ed583907123b 100644 --- a/core/java/android/text/FontConfig.java +++ b/core/java/android/text/FontConfig.java @@ -23,8 +23,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.graphics.fonts.FontVariationAxis; import android.net.Uri; -import android.os.Parcel; -import android.os.Parcelable; import java.lang.annotation.Retention; @@ -33,7 +31,7 @@ import java.lang.annotation.Retention; * Font configuration descriptions for System fonts. * @hide */ -public final class FontConfig implements Parcelable { +public final class FontConfig { private final @NonNull Family[] mFamilies; private final @NonNull Alias[] mAliases; @@ -57,37 +55,9 @@ public final class FontConfig implements Parcelable { } /** - * @hide - */ - public FontConfig(Parcel in) { - mFamilies = in.readTypedArray(Family.CREATOR); - mAliases = in.readTypedArray(Alias.CREATOR); - } - - @Override - public void writeToParcel(Parcel out, int flag) { - out.writeTypedArray(mFamilies, flag); - out.writeTypedArray(mAliases, flag); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Parcelable.Creator<FontConfig> CREATOR = new Parcelable.Creator() { - public FontConfig createFromParcel(Parcel in) { - return new FontConfig(in); - } - public FontConfig[] newArray(int size) { - return new FontConfig[size]; - } - }; - - /** * Class that holds information about a Font. */ - public static final class Font implements Parcelable { + public static final class Font { private final @NonNull String mFontName; private final int mTtcIndex; private final @NonNull FontVariationAxis[] mAxes; @@ -152,57 +122,15 @@ public final class FontConfig implements Parcelable { return mUri; } - /** - * @hide - */ public void setUri(@NonNull Uri uri) { mUri = uri; } - - /** - * @hide - */ - public Font(Parcel in) { - mFontName = in.readString(); - mTtcIndex = in.readInt(); - mAxes = in.createTypedArray(FontVariationAxis.CREATOR); - mWeight = in.readInt(); - mIsItalic = in.readInt() == 1; - mUri = in.readTypedObject(Uri.CREATOR); - } - - @Override - public void writeToParcel(Parcel out, int flag) { - out.writeString(mFontName); - out.writeInt(mTtcIndex); - out.writeTypedArray(mAxes, flag); - out.writeInt(mWeight); - out.writeInt(mIsItalic ? 1 : 0); - out.writeTypedObject(mUri, flag); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator<Font> CREATOR = new Creator<Font>() { - @Override - public Font createFromParcel(Parcel in) { - return new Font(in); - } - - @Override - public Font[] newArray(int size) { - return new Font[size]; - } - }; } /** * Class that holds information about a Font alias. */ - public static final class Alias implements Parcelable { + public static final class Alias { private final @NonNull String mName; private final @NonNull String mToName; private final int mWeight; @@ -233,45 +161,12 @@ public final class FontConfig implements Parcelable { public int getWeight() { return mWeight; } - - /** - * @hide - */ - public Alias(Parcel in) { - mName = in.readString(); - mToName = in.readString(); - mWeight = in.readInt(); - } - - @Override - public void writeToParcel(Parcel out, int flag) { - out.writeString(mName); - out.writeString(mToName); - out.writeInt(mWeight); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator<Alias> CREATOR = new Creator<Alias>() { - @Override - public Alias createFromParcel(Parcel in) { - return new Alias(in); - } - - @Override - public Alias[] newArray(int size) { - return new Alias[size]; - } - }; } /** * Class that holds information about a Font family. */ - public static final class Family implements Parcelable { + public static final class Family { private final @NonNull String mName; private final @NonNull Font[] mFonts; private final @NonNull String mLanguage; @@ -343,40 +238,5 @@ public final class FontConfig implements Parcelable { public @Variant int getVariant() { return mVariant; } - - /** - * @hide - */ - public Family(Parcel in) { - mName = in.readString(); - mFonts = in.readTypedArray(Font.CREATOR); - mLanguage = in.readString(); - mVariant = in.readInt(); - } - - @Override - public void writeToParcel(Parcel out, int flag) { - out.writeString(mName); - out.writeTypedArray(mFonts, flag); - out.writeString(mLanguage); - out.writeInt(mVariant); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator<Family> CREATOR = new Creator<Family>() { - @Override - public Family createFromParcel(Parcel in) { - return new Family(in); - } - - @Override - public Family[] newArray(int size) { - return new Family[size]; - } - }; } } diff --git a/graphics/java/android/graphics/fonts/FontVariationAxis.java b/graphics/java/android/graphics/fonts/FontVariationAxis.java index 91ec0e8df912..fb2a3a873394 100644 --- a/graphics/java/android/graphics/fonts/FontVariationAxis.java +++ b/graphics/java/android/graphics/fonts/FontVariationAxis.java @@ -18,8 +18,6 @@ package android.graphics.fonts; import android.annotation.NonNull; import android.annotation.Nullable; -import android.os.Parcel; -import android.os.Parcelable; import android.text.TextUtils; import java.util.ArrayList; @@ -28,7 +26,7 @@ import java.util.regex.Pattern; /** * Class that holds information about single font variation axis. */ -public final class FontVariationAxis implements Parcelable { +public final class FontVariationAxis { private final int mTag; private final String mTagString; private final float mStyleValue; @@ -74,39 +72,6 @@ public final class FontVariationAxis implements Parcelable { } /** - * @hide - */ - public FontVariationAxis(Parcel in) { - mTag = in.readInt(); - mTagString = in.readString(); - mStyleValue = in.readFloat(); - } - - @Override - public void writeToParcel(Parcel out, int flag) { - out.writeInt(mTag); - out.writeString(mTagString); - out.writeFloat(mStyleValue); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator<FontVariationAxis> CREATOR = new Creator<FontVariationAxis>() { - @Override - public FontVariationAxis createFromParcel(Parcel in) { - return new FontVariationAxis(in); - } - - @Override - public FontVariationAxis[] newArray(int size) { - return new FontVariationAxis[size]; - } - }; - - /** * Returns a valid font variation setting string for this object. */ @Override |