Merge "Unhide Typeface construction APIs." (c34f7866) · Commits · e / os / android_frameworks_base

api/current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -13769,6 +13769,26 @@ package android.graphics {
		field public static final android.graphics.Typeface SERIF;
		}

		public static final class Typeface.Builder {
		ctor public Typeface.Builder();
		method public android.graphics.Typeface build();
		method public static android.graphics.Typeface.Builder obtain();
		method public void recycle();
		method public void reset();
		method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String);
		method public android.graphics.Typeface.Builder setFontVariationSettings(android.text.FontConfig.Axis[]);
		method public android.graphics.Typeface.Builder setItalic(int);
		method public android.graphics.Typeface.Builder setSourceFromAsset(android.content.res.AssetManager, java.lang.String);
		method public android.graphics.Typeface.Builder setSourceFromFile(java.io.File);
		method public android.graphics.Typeface.Builder setSourceFromFile(java.io.FileDescriptor);
		method public android.graphics.Typeface.Builder setSourceFromFilePath(java.lang.String);
		method public android.graphics.Typeface.Builder setTtcIndex(int);
		method public android.graphics.Typeface.Builder setWeight(int);
		field public static final int ITALIC = 1; // 0x1
		field public static final int NORMAL = 0; // 0x0
		field public static final int RESOLVE_BY_FONT_TABLE = -1; // 0xffffffff
		}

		public static abstract interface Typeface.FontRequestCallback {
		method public abstract void onTypefaceRequestFailed(int);
		method public abstract void onTypefaceRetrieved(android.graphics.Typeface);
		@@ -41027,6 +41047,7 @@ package android.text {

		public static final class FontConfig.Axis implements android.os.Parcelable {
		ctor public FontConfig.Axis(int, float);
		ctor public FontConfig.Axis(java.lang.String, float);
		method public int describeContents();
		method public float getStyleValue();
		method public int getTag();

api/system-current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -14492,6 +14492,26 @@ package android.graphics {
		field public static final android.graphics.Typeface SERIF;
		}

		public static final class Typeface.Builder {
		ctor public Typeface.Builder();
		method public android.graphics.Typeface build();
		method public static android.graphics.Typeface.Builder obtain();
		method public void recycle();
		method public void reset();
		method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String);
		method public android.graphics.Typeface.Builder setFontVariationSettings(android.text.FontConfig.Axis[]);
		method public android.graphics.Typeface.Builder setItalic(int);
		method public android.graphics.Typeface.Builder setSourceFromAsset(android.content.res.AssetManager, java.lang.String);
		method public android.graphics.Typeface.Builder setSourceFromFile(java.io.File);
		method public android.graphics.Typeface.Builder setSourceFromFile(java.io.FileDescriptor);
		method public android.graphics.Typeface.Builder setSourceFromFilePath(java.lang.String);
		method public android.graphics.Typeface.Builder setTtcIndex(int);
		method public android.graphics.Typeface.Builder setWeight(int);
		field public static final int ITALIC = 1; // 0x1
		field public static final int NORMAL = 0; // 0x0
		field public static final int RESOLVE_BY_FONT_TABLE = -1; // 0xffffffff
		}

		public static abstract interface Typeface.FontRequestCallback {
		method public abstract void onTypefaceRequestFailed(int);
		method public abstract void onTypefaceRetrieved(android.graphics.Typeface);
		@@ -44479,6 +44499,7 @@ package android.text {

		public static final class FontConfig.Axis implements android.os.Parcelable {
		ctor public FontConfig.Axis(int, float);
		ctor public FontConfig.Axis(java.lang.String, float);
		method public int describeContents();
		method public float getStyleValue();
		method public int getTag();

api/test-current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -13807,6 +13807,26 @@ package android.graphics {
		field public static final android.graphics.Typeface SERIF;
		}

		public static final class Typeface.Builder {
		ctor public Typeface.Builder();
		method public android.graphics.Typeface build();
		method public static android.graphics.Typeface.Builder obtain();
		method public void recycle();
		method public void reset();
		method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String);
		method public android.graphics.Typeface.Builder setFontVariationSettings(android.text.FontConfig.Axis[]);
		method public android.graphics.Typeface.Builder setItalic(int);
		method public android.graphics.Typeface.Builder setSourceFromAsset(android.content.res.AssetManager, java.lang.String);
		method public android.graphics.Typeface.Builder setSourceFromFile(java.io.File);
		method public android.graphics.Typeface.Builder setSourceFromFile(java.io.FileDescriptor);
		method public android.graphics.Typeface.Builder setSourceFromFilePath(java.lang.String);
		method public android.graphics.Typeface.Builder setTtcIndex(int);
		method public android.graphics.Typeface.Builder setWeight(int);
		field public static final int ITALIC = 1; // 0x1
		field public static final int NORMAL = 0; // 0x0
		field public static final int RESOLVE_BY_FONT_TABLE = -1; // 0xffffffff
		}

		public static abstract interface Typeface.FontRequestCallback {
		method public abstract void onTypefaceRequestFailed(int);
		method public abstract void onTypefaceRetrieved(android.graphics.Typeface);
		@@ -41222,6 +41242,7 @@ package android.text {

		public static final class FontConfig.Axis implements android.os.Parcelable {
		ctor public FontConfig.Axis(int, float);
		ctor public FontConfig.Axis(java.lang.String, float);
		method public int describeContents();
		method public float getStyleValue();
		method public int getTag();

core/java/android/text/FontConfig.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,6 @@ public final class FontConfig implements Parcelable {
		mStyleValue = styleValue;
		}

		/** @hide */
		public Axis(@NonNull String tagString, float styleValue) {
		if (!FontListParser.isValidTag(tagString)) {
		throw new IllegalArgumentException("Invalid tag pattern: " + tagString);

graphics/java/android/graphics/Typeface.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -490,7 +490,6 @@ public class Typeface {
		*
		* <p>Note that only one source can be specified for the single Typeface.</p>
		*/
		/** @hide TODO: Make this API public. */
		public static final class Builder {
		/**
		* Value for weight and italic.