Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev (408ec0b4) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −9

Original line number	Diff line number	Diff line
		@@ -13284,7 +13284,7 @@ package android.graphics {
		method public void setFilterBitmap(boolean);
		method public void setFlags(int);
		method public void setFontFeatureSettings(java.lang.String);
		method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public boolean setFontVariationSettings(java.lang.String);
		method public void setHinting(int);
		method public void setLetterSpacing(float);
		method public void setLinearText(boolean);
		@@ -13811,7 +13811,7 @@ package android.graphics {
		ctor public Typeface.Builder(android.content.res.AssetManager, java.lang.String);
		method public android.graphics.Typeface build();
		method public android.graphics.Typeface.Builder setFallback(java.lang.String);
		method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String);
		method public android.graphics.Typeface.Builder setFontVariationSettings(android.graphics.fonts.FontVariationAxis[]);
		method public android.graphics.Typeface.Builder setItalic(boolean);
		method public android.graphics.Typeface.Builder setTtcIndex(int);
		@@ -14395,17 +14395,13 @@ package android.graphics.drawable.shapes {
		package android.graphics.fonts {

		public final class FontVariationAxis {
		ctor public FontVariationAxis(java.lang.String, float) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		ctor public FontVariationAxis(java.lang.String, float);
		method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String);
		method public float getStyleValue();
		method public java.lang.String getTag();
		method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]);
		}

		public static class FontVariationAxis.InvalidFormatException extends java.lang.Exception {
		ctor public FontVariationAxis.InvalidFormatException(java.lang.String);
		}

		}

		package android.graphics.pdf {
		@@ -51416,7 +51412,7 @@ package android.widget {
		method public void setExtractedText(android.view.inputmethod.ExtractedText);
		method public void setFilters(android.text.InputFilter[]);
		method public void setFontFeatureSettings(java.lang.String);
		method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public boolean setFontVariationSettings(java.lang.String);
		method protected boolean setFrame(int, int, int, int);
		method public void setFreezesText(boolean);
		method public void setGravity(int);

api/system-current.txt

+5 −9

Original line number	Diff line number	Diff line
		@@ -14064,7 +14064,7 @@ package android.graphics {
		method public void setFilterBitmap(boolean);
		method public void setFlags(int);
		method public void setFontFeatureSettings(java.lang.String);
		method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public boolean setFontVariationSettings(java.lang.String);
		method public void setHinting(int);
		method public void setLetterSpacing(float);
		method public void setLinearText(boolean);
		@@ -14591,7 +14591,7 @@ package android.graphics {
		ctor public Typeface.Builder(android.content.res.AssetManager, java.lang.String);
		method public android.graphics.Typeface build();
		method public android.graphics.Typeface.Builder setFallback(java.lang.String);
		method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String);
		method public android.graphics.Typeface.Builder setFontVariationSettings(android.graphics.fonts.FontVariationAxis[]);
		method public android.graphics.Typeface.Builder setItalic(boolean);
		method public android.graphics.Typeface.Builder setTtcIndex(int);
		@@ -15175,17 +15175,13 @@ package android.graphics.drawable.shapes {
		package android.graphics.fonts {

		public final class FontVariationAxis {
		ctor public FontVariationAxis(java.lang.String, float) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		ctor public FontVariationAxis(java.lang.String, float);
		method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String);
		method public float getStyleValue();
		method public java.lang.String getTag();
		method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]);
		}

		public static class FontVariationAxis.InvalidFormatException extends java.lang.Exception {
		ctor public FontVariationAxis.InvalidFormatException(java.lang.String);
		}

		}

		package android.graphics.pdf {
		@@ -55377,7 +55373,7 @@ package android.widget {
		method public void setExtractedText(android.view.inputmethod.ExtractedText);
		method public void setFilters(android.text.InputFilter[]);
		method public void setFontFeatureSettings(java.lang.String);
		method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public boolean setFontVariationSettings(java.lang.String);
		method protected boolean setFrame(int, int, int, int);
		method public void setFreezesText(boolean);
		method public void setGravity(int);

api/test-current.txt

+5 −9

Original line number	Diff line number	Diff line
		@@ -13326,7 +13326,7 @@ package android.graphics {
		method public void setFilterBitmap(boolean);
		method public void setFlags(int);
		method public void setFontFeatureSettings(java.lang.String);
		method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public boolean setFontVariationSettings(java.lang.String);
		method public void setHinting(int);
		method public void setLetterSpacing(float);
		method public void setLinearText(boolean);
		@@ -13853,7 +13853,7 @@ package android.graphics {
		ctor public Typeface.Builder(android.content.res.AssetManager, java.lang.String);
		method public android.graphics.Typeface build();
		method public android.graphics.Typeface.Builder setFallback(java.lang.String);
		method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String);
		method public android.graphics.Typeface.Builder setFontVariationSettings(android.graphics.fonts.FontVariationAxis[]);
		method public android.graphics.Typeface.Builder setItalic(boolean);
		method public android.graphics.Typeface.Builder setTtcIndex(int);
		@@ -14441,17 +14441,13 @@ package android.graphics.drawable.shapes {
		package android.graphics.fonts {

		public final class FontVariationAxis {
		ctor public FontVariationAxis(java.lang.String, float) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		ctor public FontVariationAxis(java.lang.String, float);
		method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String);
		method public float getStyleValue();
		method public java.lang.String getTag();
		method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]);
		}

		public static class FontVariationAxis.InvalidFormatException extends java.lang.Exception {
		ctor public FontVariationAxis.InvalidFormatException(java.lang.String);
		}

		}

		package android.graphics.pdf {
		@@ -51802,7 +51798,7 @@ package android.widget {
		method public void setExtractedText(android.view.inputmethod.ExtractedText);
		method public void setFilters(android.text.InputFilter[]);
		method public void setFontFeatureSettings(java.lang.String);
		method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		method public boolean setFontVariationSettings(java.lang.String);
		method protected boolean setFrame(int, int, int, int);
		method public void setFreezesText(boolean);
		method public void setGravity(int);

core/java/android/provider/FontsContract.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		*/
		package android.provider;

		import static android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		import static java.lang.annotation.RetentionPolicy.SOURCE;

		import android.annotation.IntDef;
		@@ -601,7 +600,7 @@ public class FontsContract {
		FontInfo[] fonts = getFontFromProvider(
		context, request, providerInfo.authority, cancellationSignal);
		return new FontFamilyResult(FontFamilyResult.STATUS_OK, fonts);
		} catch (InvalidFormatException e) {
		} catch (IllegalArgumentException e) {
		return new FontFamilyResult(FontFamilyResult.STATUS_UNEXPECTED_DATA_PROVIDED, null);
		}
		}
		@@ -755,7 +754,7 @@ public class FontsContract {
		@VisibleForTesting
		public static @NonNull FontInfo[] getFontFromProvider(
		Context context, FontRequest request, String authority,
		CancellationSignal cancellationSignal) throws InvalidFormatException {
		CancellationSignal cancellationSignal) {
		ArrayList<FontInfo> result = new ArrayList<>();
		final Uri uri = new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
		.authority(authority)

core/java/android/widget/TextView.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ import android.graphics.RectF;
		import android.graphics.Typeface;
		import android.graphics.drawable.Drawable;
		import android.graphics.fonts.FontVariationAxis;
		import android.graphics.fonts.FontVariationAxis.InvalidFormatException;
		import android.icu.text.DecimalFormatSymbols;
		import android.os.AsyncTask;
		import android.os.Build.VERSION_CODES;
		@@ -3925,14 +3924,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* TextView. This function also returns true for empty settings string. Otherwise
		* returns false.
		*
		* @throws InvalidFormatException If given string is not a valid font variation settings
		* @throws IllegalArgumentException If given string is not a valid font variation settings
		* format.
		*
		* @see #getFontVariationSettings()
		* @see FontVariationAxis
		*/
		public boolean setFontVariationSettings(@Nullable String fontVariationSettings)
		throws InvalidFormatException {
		public boolean setFontVariationSettings(@Nullable String fontVariationSettings) {
		final String existingSettings = mTextPaint.getFontVariationSettings();
		if (fontVariationSettings == existingSettings
		\|\| (fontVariationSettings != null