Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev (061db23b) · Commits · e / os / android_frameworks_base

api/current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -34501,6 +34501,9 @@ package android.provider {
		}

		public class FontsContract {
		method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[], int, boolean, java.lang.String);
		method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[]);
		method public static android.provider.FontsContract.FontFamilyResult fetchFonts(android.content.Context, android.os.CancellationSignal, android.graphics.fonts.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;
		}

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		@@ -34517,6 +34520,23 @@ package android.provider {
		field public static final java.lang.String WEIGHT = "font_weight";
		}

		public static class FontsContract.FontFamilyResult {
		method 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_UNEXPECTED_DATA_PROVIDED = 2; // 0x2
		field public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1
		}

		public static class FontsContract.FontInfo {
		method public android.graphics.fonts.FontVariationAxis[] getAxes();
		method public int getResultCode();
		method public int getTtcIndex();
		method public android.net.Uri getUri();
		method public int getWeight();
		method public boolean isItalic();
		}

		public final deprecated class LiveFolders implements android.provider.BaseColumns {
		field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";
		field public static final java.lang.String DESCRIPTION = "description";

api/system-current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -37478,6 +37478,9 @@ package android.provider {
		}

		public class FontsContract {
		method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[], int, boolean, java.lang.String);
		method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[]);
		method public static android.provider.FontsContract.FontFamilyResult fetchFonts(android.content.Context, android.os.CancellationSignal, android.graphics.fonts.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;
		}

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		@@ -37494,6 +37497,23 @@ package android.provider {
		field public static final java.lang.String WEIGHT = "font_weight";
		}

		public static class FontsContract.FontFamilyResult {
		method 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_UNEXPECTED_DATA_PROVIDED = 2; // 0x2
		field public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1
		}

		public static class FontsContract.FontInfo {
		method public android.graphics.fonts.FontVariationAxis[] getAxes();
		method public int getResultCode();
		method public int getTtcIndex();
		method public android.net.Uri getUri();
		method public int getWeight();
		method public boolean isItalic();
		}

		public final deprecated class LiveFolders implements android.provider.BaseColumns {
		field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";
		field public static final java.lang.String DESCRIPTION = "description";

api/test-current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -34644,6 +34644,9 @@ package android.provider {
		}

		public class FontsContract {
		method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[], int, boolean, java.lang.String);
		method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[]);
		method public static android.provider.FontsContract.FontFamilyResult fetchFonts(android.content.Context, android.os.CancellationSignal, android.graphics.fonts.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;
		}

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		@@ -34660,6 +34663,23 @@ package android.provider {
		field public static final java.lang.String WEIGHT = "font_weight";
		}

		public static class FontsContract.FontFamilyResult {
		method 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_UNEXPECTED_DATA_PROVIDED = 2; // 0x2
		field public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1
		}

		public static class FontsContract.FontInfo {
		method public android.graphics.fonts.FontVariationAxis[] getAxes();
		method public int getResultCode();
		method public int getTtcIndex();
		method public android.net.Uri getUri();
		method public int getWeight();
		method public boolean isItalic();
		}

		public final deprecated class LiveFolders implements android.provider.BaseColumns {
		field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";
		field public static final java.lang.String DESCRIPTION = "description";

core/java/android/provider/FontsContract.java

+367 −87

File changed.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/android/provider/FontsContractTest.java

+167 −130

File changed.

Preview size limit exceeded, changes collapsed.