Merge "Deprecate DownloadableFonts in framework." (5c9039e1) · Commits · e / os / android_frameworks_base

api/current.txt

+60 −60

Original line number	Diff line number	Diff line
		@@ -646,10 +646,10 @@ package android {
		field public static final int font = 16844082; // 0x1010532
		field public static final int fontFamily = 16843692; // 0x10103ac
		field public static final int fontFeatureSettings = 16843959; // 0x10104b7
		field public static final int fontProviderAuthority = 16844112; // 0x1010550
		field public static final int fontProviderCerts = 16844125; // 0x101055d
		field public static final int fontProviderPackage = 16844119; // 0x1010557
		field public static final int fontProviderQuery = 16844113; // 0x1010551
		field @Deprecated public static final int fontProviderAuthority = 16844112; // 0x1010550
		field @Deprecated public static final int fontProviderCerts = 16844125; // 0x101055d
		field @Deprecated public static final int fontProviderPackage = 16844119; // 0x1010557
		field @Deprecated public static final int fontProviderQuery = 16844113; // 0x1010551
		field public static final int fontStyle = 16844095; // 0x101053f
		field public static final int fontVariationSettings = 16844144; // 0x1010570
		field public static final int fontWeight = 16844083; // 0x1010533
		@@ -40190,62 +40190,62 @@ package android.provider {
		method public final int update(android.net.Uri, android.content.ContentValues, String, String[]);
		}

		public final class FontRequest {
		ctor public FontRequest(@NonNull String, @NonNull String, @NonNull String);
		ctor public FontRequest(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.List<java.util.List<byte[]>>);
		method public java.util.List<java.util.List<byte[]>> getCertificates();
		method public String getProviderAuthority();
		method public String getProviderPackage();
		method public String getQuery();
		}

		public class FontsContract {
		method public static android.graphics.Typeface buildTypeface(@NonNull android.content.Context, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontsContract.FontInfo[]);
		method @NonNull public static android.provider.FontsContract.FontFamilyResult fetchFonts(@NonNull android.content.Context, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;
		method public static void requestFonts(@NonNull android.content.Context, @NonNull android.provider.FontRequest, @NonNull android.os.Handler, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontsContract.FontRequestCallback);
		}

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		field public static final String FILE_ID = "file_id";
		field public static final String ITALIC = "font_italic";
		field public static final String RESULT_CODE = "result_code";
		field public static final int RESULT_CODE_FONT_NOT_FOUND = 1; // 0x1
		field public static final int RESULT_CODE_FONT_UNAVAILABLE = 2; // 0x2
		field public static final int RESULT_CODE_MALFORMED_QUERY = 3; // 0x3
		field public static final int RESULT_CODE_OK = 0; // 0x0
		field public static final String TTC_INDEX = "font_ttc_index";
		field public static final String VARIATION_SETTINGS = "font_variation_settings";
		field public static final String WEIGHT = "font_weight";
		}

		public static class FontsContract.FontFamilyResult {
		method @NonNull public android.provider.FontsContract.FontInfo[] getFonts();
		method public int getStatusCode();
		field public static final int STATUS_OK = 0; // 0x0
		field public static final int STATUS_REJECTED = 3; // 0x3
		field public static final int STATUS_UNEXPECTED_DATA_PROVIDED = 2; // 0x2
		field public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1
		}

		public static class FontsContract.FontInfo {
		method @Nullable public android.graphics.fonts.FontVariationAxis[] getAxes();
		method public int getResultCode();
		method @IntRange(from=0) public int getTtcIndex();
		method @NonNull public android.net.Uri getUri();
		method @IntRange(from=1, to=1000) public int getWeight();
		method public boolean isItalic();
		}

		public static class FontsContract.FontRequestCallback {
		ctor public FontsContract.FontRequestCallback();
		method public void onTypefaceRequestFailed(int);
		method public void onTypefaceRetrieved(android.graphics.Typeface);
		field public static final int FAIL_REASON_FONT_LOAD_ERROR = -3; // 0xfffffffd
		field public static final int FAIL_REASON_FONT_NOT_FOUND = 1; // 0x1
		field public static final int FAIL_REASON_FONT_UNAVAILABLE = 2; // 0x2
		field public static final int FAIL_REASON_MALFORMED_QUERY = 3; // 0x3
		field public static final int FAIL_REASON_PROVIDER_NOT_FOUND = -1; // 0xffffffff
		field public static final int FAIL_REASON_WRONG_CERTIFICATES = -2; // 0xfffffffe
		@Deprecated public final class FontRequest {
		ctor @Deprecated public FontRequest(@NonNull String, @NonNull String, @NonNull String);
		ctor @Deprecated public FontRequest(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.List<java.util.List<byte[]>>);
		method @Deprecated public java.util.List<java.util.List<byte[]>> getCertificates();
		method @Deprecated public String getProviderAuthority();
		method @Deprecated public String getProviderPackage();
		method @Deprecated public String getQuery();
		}

		@Deprecated public class FontsContract {
		method @Deprecated public static android.graphics.Typeface buildTypeface(@NonNull android.content.Context, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontsContract.FontInfo[]);
		method @Deprecated @NonNull public static android.provider.FontsContract.FontFamilyResult fetchFonts(@NonNull android.content.Context, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;
		method @Deprecated public static void requestFonts(@NonNull android.content.Context, @NonNull android.provider.FontRequest, @NonNull android.os.Handler, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontsContract.FontRequestCallback);
		}

		@Deprecated public static final class FontsContract.Columns implements android.provider.BaseColumns {
		field @Deprecated public static final String FILE_ID = "file_id";
		field @Deprecated public static final String ITALIC = "font_italic";
		field @Deprecated public static final String RESULT_CODE = "result_code";
		field @Deprecated public static final int RESULT_CODE_FONT_NOT_FOUND = 1; // 0x1
		field @Deprecated public static final int RESULT_CODE_FONT_UNAVAILABLE = 2; // 0x2
		field @Deprecated public static final int RESULT_CODE_MALFORMED_QUERY = 3; // 0x3
		field @Deprecated public static final int RESULT_CODE_OK = 0; // 0x0
		field @Deprecated public static final String TTC_INDEX = "font_ttc_index";
		field @Deprecated public static final String VARIATION_SETTINGS = "font_variation_settings";
		field @Deprecated public static final String WEIGHT = "font_weight";
		}

		@Deprecated public static class FontsContract.FontFamilyResult {
		method @Deprecated @NonNull public android.provider.FontsContract.FontInfo[] getFonts();
		method @Deprecated public int getStatusCode();
		field @Deprecated public static final int STATUS_OK = 0; // 0x0
		field @Deprecated public static final int STATUS_REJECTED = 3; // 0x3
		field @Deprecated public static final int STATUS_UNEXPECTED_DATA_PROVIDED = 2; // 0x2
		field @Deprecated public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1
		}

		@Deprecated public static class FontsContract.FontInfo {
		method @Deprecated @Nullable public android.graphics.fonts.FontVariationAxis[] getAxes();
		method @Deprecated public int getResultCode();
		method @Deprecated @IntRange(from=0) public int getTtcIndex();
		method @Deprecated @NonNull public android.net.Uri getUri();
		method @Deprecated @IntRange(from=1, to=1000) public int getWeight();
		method @Deprecated public boolean isItalic();
		}

		@Deprecated public static class FontsContract.FontRequestCallback {
		ctor @Deprecated public FontsContract.FontRequestCallback();
		method @Deprecated public void onTypefaceRequestFailed(int);
		method @Deprecated public void onTypefaceRetrieved(android.graphics.Typeface);
		field @Deprecated public static final int FAIL_REASON_FONT_LOAD_ERROR = -3; // 0xfffffffd
		field @Deprecated public static final int FAIL_REASON_FONT_NOT_FOUND = 1; // 0x1
		field @Deprecated public static final int FAIL_REASON_FONT_UNAVAILABLE = 2; // 0x2
		field @Deprecated public static final int FAIL_REASON_MALFORMED_QUERY = 3; // 0x3
		field @Deprecated public static final int FAIL_REASON_PROVIDER_NOT_FOUND = -1; // 0xffffffff
		field @Deprecated public static final int FAIL_REASON_WRONG_CERTIFICATES = -2; // 0xfffffffe
		}

		@Deprecated public final class LiveFolders implements android.provider.BaseColumns {

core/java/android/provider/FontRequest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,13 +20,14 @@ import android.util.Base64;

		import com.android.internal.util.Preconditions;

		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;

		/**
		* Information about a font request that may be sent to a Font Provider.
		* @deprecated Use the {@link androidx.core.provider.FontRequest}
		*/
		@Deprecated
		public final class FontRequest {
		private final String mProviderAuthority;
		private final String mProviderPackage;

core/java/android/provider/FontsContract.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -69,7 +69,11 @@ import java.util.concurrent.locks.ReentrantLock;

		/**
		* Utility class to deal with Font ContentProviders.
		* @deprecated Use the <a href="{@docRoot}jetpack">Jetpack Core Library</a>
		* {@link androidx.core.provider.FontsContractCompat} for consistent behavior across all
		* devices.
		*/
		@Deprecated
		public class FontsContract {
		private static final String TAG = "FontsContract";

		@@ -79,7 +83,11 @@ public class FontsContract {
		* This should point to a real file or shared memory, as the client will mmap the given file
		* descriptor. Pipes, sockets and other non-mmap-able file descriptors will fail to load in the
		* client application.
		*
		* @deprecated Use the {@link androidx.core.provider.FontsContractCompat.Columns} for consistent
		* behavior across all devices.
		*/
		@Deprecated
		public static final class Columns implements BaseColumns {

		// Do not instantiate.
		@@ -174,7 +182,11 @@ public class FontsContract {

		/**
		* Object represent a font entry in the family returned from {@link #fetchFonts}.
		*
		* @deprecated Use the {@link androidx.core.provider.FontsContractCompat.FontInfo} for
		* consistent behavior across all devices
		*/
		@Deprecated
		public static class FontInfo {
		private final Uri mUri;
		private final int mTtcIndex;
		@@ -251,7 +263,11 @@ public class FontsContract {

		/**
		* Object returned from {@link #fetchFonts}.
		*
		* @deprecated Use the {@link androidx.core.provider.FontsContractCompat.FontFamilyResult} for
		* consistent behavior across all devices
		*/
		@Deprecated
		public static class FontFamilyResult {
		/**
		* Constant represents that the font was successfully retrieved. Note that when this value
		@@ -412,7 +428,11 @@ public class FontsContract {

		/**
		* Interface used to receive asynchronously fetched typefaces.
		*
		* @deprecated Use the {@link androidx.core.provider.FontsContractCompat.FontRequestCallback}
		* for consistent behavior across all devices
		*/
		@Deprecated
		public static class FontRequestCallback {
		/**
		* Constant returned by {@link #onTypefaceRequestFailed(int)} signaling that the given

core/res/res/values/attrs.xml

+16 −5

Original line number	Diff line number	Diff line
		@@ -9180,21 +9180,32 @@
		<attr name="fontVariationSettings" format="string" />
		</declare-styleable>

		<!-- Attributes that are read when parsing a <fontfamily> tag. -->
		<!-- Attributes that are read when parsing a <fontfamily> tag.
		{@deprecated Use Jetpack Core library instead.}
		-->
		<declare-styleable name="FontFamily">
		<!-- The authority of the Font Provider to be used for the request. -->
		<!-- The authority of the Font Provider to be used for the request.
		{@deprecated Use app:fontProviderAuthority with Jetpack Core library instead for
		consistent behavior across all devices.}
		-->
		<attr name="fontProviderAuthority" format="string" />
		<!-- The package for the Font Provider to be used for the request. This is used to verify
		the identity of the provider. -->
		the identity of the provider.
		{@deprecated Use app:fontProviderPackage with Jetpack Core library instead.}
		-->
		<attr name="fontProviderPackage" format="string" />
		<!-- The query to be sent over to the provider. Refer to your font provider's documentation
		on the format of this string. -->
		on the format of this string.
		{@deprecated Use app:fontProviderQuery with Jetpack Core library instead.}
		-->
		<attr name="fontProviderQuery" format="string" />
		<!-- The sets of hashes for the certificates the provider should be signed with. This is
		used to verify the identity of the provider, and is only required if the provider is not
		part of the system image. This value may point to one list or a list of lists, where each
		individual list represents one collection of signature hashes. Refer to your font provider's
		documentation for these values. -->
		documentation for these values.
		{@deprecated Use app:fontProviderCerts with Jetpack Core library instead.}
		-->
		<attr name="fontProviderCerts" format="reference" />
		</declare-styleable>

non-updatable-api/current.txt

+60 −60

Original line number	Diff line number	Diff line
		@@ -646,10 +646,10 @@ package android {
		field public static final int font = 16844082; // 0x1010532
		field public static final int fontFamily = 16843692; // 0x10103ac
		field public static final int fontFeatureSettings = 16843959; // 0x10104b7
		field public static final int fontProviderAuthority = 16844112; // 0x1010550
		field public static final int fontProviderCerts = 16844125; // 0x101055d
		field public static final int fontProviderPackage = 16844119; // 0x1010557
		field public static final int fontProviderQuery = 16844113; // 0x1010551
		field @Deprecated public static final int fontProviderAuthority = 16844112; // 0x1010550
		field @Deprecated public static final int fontProviderCerts = 16844125; // 0x101055d
		field @Deprecated public static final int fontProviderPackage = 16844119; // 0x1010557
		field @Deprecated public static final int fontProviderQuery = 16844113; // 0x1010551
		field public static final int fontStyle = 16844095; // 0x101053f
		field public static final int fontVariationSettings = 16844144; // 0x1010570
		field public static final int fontWeight = 16844083; // 0x1010533
		@@ -38725,62 +38725,62 @@ package android.provider {
		method public final int update(android.net.Uri, android.content.ContentValues, String, String[]);
		}

		public final class FontRequest {
		ctor public FontRequest(@NonNull String, @NonNull String, @NonNull String);
		ctor public FontRequest(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.List<java.util.List<byte[]>>);
		method public java.util.List<java.util.List<byte[]>> getCertificates();
		method public String getProviderAuthority();
		method public String getProviderPackage();
		method public String getQuery();
		}

		public class FontsContract {
		method public static android.graphics.Typeface buildTypeface(@NonNull android.content.Context, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontsContract.FontInfo[]);
		method @NonNull public static android.provider.FontsContract.FontFamilyResult fetchFonts(@NonNull android.content.Context, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;
		method public static void requestFonts(@NonNull android.content.Context, @NonNull android.provider.FontRequest, @NonNull android.os.Handler, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontsContract.FontRequestCallback);
		}

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		field public static final String FILE_ID = "file_id";
		field public static final String ITALIC = "font_italic";
		field public static final String RESULT_CODE = "result_code";
		field public static final int RESULT_CODE_FONT_NOT_FOUND = 1; // 0x1
		field public static final int RESULT_CODE_FONT_UNAVAILABLE = 2; // 0x2
		field public static final int RESULT_CODE_MALFORMED_QUERY = 3; // 0x3
		field public static final int RESULT_CODE_OK = 0; // 0x0
		field public static final String TTC_INDEX = "font_ttc_index";
		field public static final String VARIATION_SETTINGS = "font_variation_settings";
		field public static final String WEIGHT = "font_weight";
		}

		public static class FontsContract.FontFamilyResult {
		method @NonNull public android.provider.FontsContract.FontInfo[] getFonts();
		method public int getStatusCode();
		field public static final int STATUS_OK = 0; // 0x0
		field public static final int STATUS_REJECTED = 3; // 0x3
		field public static final int STATUS_UNEXPECTED_DATA_PROVIDED = 2; // 0x2
		field public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1
		}

		public static class FontsContract.FontInfo {
		method @Nullable public android.graphics.fonts.FontVariationAxis[] getAxes();
		method public int getResultCode();
		method @IntRange(from=0) public int getTtcIndex();
		method @NonNull public android.net.Uri getUri();
		method @IntRange(from=1, to=1000) public int getWeight();
		method public boolean isItalic();
		}

		public static class FontsContract.FontRequestCallback {
		ctor public FontsContract.FontRequestCallback();
		method public void onTypefaceRequestFailed(int);
		method public void onTypefaceRetrieved(android.graphics.Typeface);
		field public static final int FAIL_REASON_FONT_LOAD_ERROR = -3; // 0xfffffffd
		field public static final int FAIL_REASON_FONT_NOT_FOUND = 1; // 0x1
		field public static final int FAIL_REASON_FONT_UNAVAILABLE = 2; // 0x2
		field public static final int FAIL_REASON_MALFORMED_QUERY = 3; // 0x3
		field public static final int FAIL_REASON_PROVIDER_NOT_FOUND = -1; // 0xffffffff
		field public static final int FAIL_REASON_WRONG_CERTIFICATES = -2; // 0xfffffffe
		@Deprecated public final class FontRequest {
		ctor @Deprecated public FontRequest(@NonNull String, @NonNull String, @NonNull String);
		ctor @Deprecated public FontRequest(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.List<java.util.List<byte[]>>);
		method @Deprecated public java.util.List<java.util.List<byte[]>> getCertificates();
		method @Deprecated public String getProviderAuthority();
		method @Deprecated public String getProviderPackage();
		method @Deprecated public String getQuery();
		}

		@Deprecated public class FontsContract {
		method @Deprecated public static android.graphics.Typeface buildTypeface(@NonNull android.content.Context, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontsContract.FontInfo[]);
		method @Deprecated @NonNull public static android.provider.FontsContract.FontFamilyResult fetchFonts(@NonNull android.content.Context, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;
		method @Deprecated public static void requestFonts(@NonNull android.content.Context, @NonNull android.provider.FontRequest, @NonNull android.os.Handler, @Nullable android.os.CancellationSignal, @NonNull android.provider.FontsContract.FontRequestCallback);
		}

		@Deprecated public static final class FontsContract.Columns implements android.provider.BaseColumns {
		field @Deprecated public static final String FILE_ID = "file_id";
		field @Deprecated public static final String ITALIC = "font_italic";
		field @Deprecated public static final String RESULT_CODE = "result_code";
		field @Deprecated public static final int RESULT_CODE_FONT_NOT_FOUND = 1; // 0x1
		field @Deprecated public static final int RESULT_CODE_FONT_UNAVAILABLE = 2; // 0x2
		field @Deprecated public static final int RESULT_CODE_MALFORMED_QUERY = 3; // 0x3
		field @Deprecated public static final int RESULT_CODE_OK = 0; // 0x0
		field @Deprecated public static final String TTC_INDEX = "font_ttc_index";
		field @Deprecated public static final String VARIATION_SETTINGS = "font_variation_settings";
		field @Deprecated public static final String WEIGHT = "font_weight";
		}

		@Deprecated public static class FontsContract.FontFamilyResult {
		method @Deprecated @NonNull public android.provider.FontsContract.FontInfo[] getFonts();
		method @Deprecated public int getStatusCode();
		field @Deprecated public static final int STATUS_OK = 0; // 0x0
		field @Deprecated public static final int STATUS_REJECTED = 3; // 0x3
		field @Deprecated public static final int STATUS_UNEXPECTED_DATA_PROVIDED = 2; // 0x2
		field @Deprecated public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1
		}

		@Deprecated public static class FontsContract.FontInfo {
		method @Deprecated @Nullable public android.graphics.fonts.FontVariationAxis[] getAxes();
		method @Deprecated public int getResultCode();
		method @Deprecated @IntRange(from=0) public int getTtcIndex();
		method @Deprecated @NonNull public android.net.Uri getUri();
		method @Deprecated @IntRange(from=1, to=1000) public int getWeight();
		method @Deprecated public boolean isItalic();
		}

		@Deprecated public static class FontsContract.FontRequestCallback {
		ctor @Deprecated public FontsContract.FontRequestCallback();
		method @Deprecated public void onTypefaceRequestFailed(int);
		method @Deprecated public void onTypefaceRetrieved(android.graphics.Typeface);
		field @Deprecated public static final int FAIL_REASON_FONT_LOAD_ERROR = -3; // 0xfffffffd
		field @Deprecated public static final int FAIL_REASON_FONT_NOT_FOUND = 1; // 0x1
		field @Deprecated public static final int FAIL_REASON_FONT_UNAVAILABLE = 2; // 0x2
		field @Deprecated public static final int FAIL_REASON_MALFORMED_QUERY = 3; // 0x3
		field @Deprecated public static final int FAIL_REASON_PROVIDER_NOT_FOUND = -1; // 0xffffffff
		field @Deprecated public static final int FAIL_REASON_WRONG_CERTIFICATES = -2; // 0xfffffffe
		}

		@Deprecated public final class LiveFolders implements android.provider.BaseColumns {