From 080b054bddee55428943b821c99887543d1fd290 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 26 Apr 2017 09:53:38 -0700 Subject: [PATCH] Font API clean up - Move FontRequest from android.graphics.fonts to android.provider since this is only used by android.provider.FontsContract and never draw anything. - FontRequest is no longer being Parcelable. - Remove FontSpec.aidl which is not necessary. Bug: 37326126 Test: am instrument -w -e class android.provider.FontsContractTest com.android.frameworks.coretests/\ android.support.test.runner.AndroidJUnitRunner Test: am instrument -w -e class android.provider.cts.FontProviderTest android.provider.cts/android.support.test.runner.AndroidJUnitRunner Test: am instrument -w -e class android.provider.cts.FontRequestTest android.provider.cts/android.support.test.runner.AndroidJUnitRunner Change-Id: I0eb501844247c2f07eaa1fc7a71f72e404888b5b --- api/current.txt | 25 +++++------ api/system-current.txt | 25 +++++------ api/test-current.txt | 25 +++++------ .../java/android/provider}/FontRequest.java | 42 +------------------ core/java/android/provider/FontsContract.java | 1 - .../provider/FontsContractE2ETest.java | 1 - .../android/provider/FontsContractTest.java | 1 - graphics/java/android/graphics/Typeface.java | 2 +- .../java/android/graphics/fonts/FontSpec.aidl | 18 -------- 9 files changed, 36 insertions(+), 104 deletions(-) rename {graphics/java/android/graphics/fonts => core/java/android/provider}/FontRequest.java (80%) delete mode 100644 graphics/java/android/graphics/fonts/FontSpec.aidl diff --git a/api/current.txt b/api/current.txt index 5b7f457abb8b0..8a23e5c09f960 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14393,18 +14393,6 @@ package android.graphics.drawable.shapes { package android.graphics.fonts { - public final class FontRequest implements android.os.Parcelable { - ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String); - ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String, java.util.List>); - method public int describeContents(); - method public java.util.List> getCertificates(); - method public java.lang.String getProviderAuthority(); - method public java.lang.String getProviderPackage(); - method public java.lang.String getQuery(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - 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; @@ -34484,11 +34472,20 @@ package android.provider { method public final int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]); } + public final class FontRequest { + ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String); + ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String, java.util.List>); + method public java.util.List> getCertificates(); + method public java.lang.String getProviderAuthority(); + method public java.lang.String getProviderPackage(); + method public java.lang.String getQuery(); + } + 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; - method public static void requestFonts(android.content.Context, android.graphics.fonts.FontRequest, android.os.Handler, android.os.CancellationSignal, android.provider.FontsContract.FontRequestCallback); + method public static android.provider.FontsContract.FontFamilyResult fetchFonts(android.content.Context, android.os.CancellationSignal, android.provider.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException; + method public static void requestFonts(android.content.Context, android.provider.FontRequest, android.os.Handler, android.os.CancellationSignal, android.provider.FontsContract.FontRequestCallback); } public static final class FontsContract.Columns implements android.provider.BaseColumns { diff --git a/api/system-current.txt b/api/system-current.txt index 921a97dfa8f1e..21a97ae22c47f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -15168,18 +15168,6 @@ package android.graphics.drawable.shapes { package android.graphics.fonts { - public final class FontRequest implements android.os.Parcelable { - ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String); - ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String, java.util.List>); - method public int describeContents(); - method public java.util.List> getCertificates(); - method public java.lang.String getProviderAuthority(); - method public java.lang.String getProviderPackage(); - method public java.lang.String getQuery(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - 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; @@ -37474,11 +37462,20 @@ package android.provider { method public final int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]); } + public final class FontRequest { + ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String); + ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String, java.util.List>); + method public java.util.List> getCertificates(); + method public java.lang.String getProviderAuthority(); + method public java.lang.String getProviderPackage(); + method public java.lang.String getQuery(); + } + 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; - method public static void requestFonts(android.content.Context, android.graphics.fonts.FontRequest, android.os.Handler, android.os.CancellationSignal, android.provider.FontsContract.FontRequestCallback); + method public static android.provider.FontsContract.FontFamilyResult fetchFonts(android.content.Context, android.os.CancellationSignal, android.provider.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException; + method public static void requestFonts(android.content.Context, android.provider.FontRequest, android.os.Handler, android.os.CancellationSignal, android.provider.FontsContract.FontRequestCallback); } public static final class FontsContract.Columns implements android.provider.BaseColumns { diff --git a/api/test-current.txt b/api/test-current.txt index 75ddd8d2b63d4..ecfe75cf978d2 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -14439,18 +14439,6 @@ package android.graphics.drawable.shapes { package android.graphics.fonts { - public final class FontRequest implements android.os.Parcelable { - ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String); - ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String, java.util.List>); - method public int describeContents(); - method public java.util.List> getCertificates(); - method public java.lang.String getProviderAuthority(); - method public java.lang.String getProviderPackage(); - method public java.lang.String getQuery(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - 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; @@ -34620,11 +34608,20 @@ package android.provider { method public final int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]); } + public final class FontRequest { + ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String); + ctor public FontRequest(java.lang.String, java.lang.String, java.lang.String, java.util.List>); + method public java.util.List> getCertificates(); + method public java.lang.String getProviderAuthority(); + method public java.lang.String getProviderPackage(); + method public java.lang.String getQuery(); + } + 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; - method public static void requestFonts(android.content.Context, android.graphics.fonts.FontRequest, android.os.Handler, android.os.CancellationSignal, android.provider.FontsContract.FontRequestCallback); + method public static android.provider.FontsContract.FontFamilyResult fetchFonts(android.content.Context, android.os.CancellationSignal, android.provider.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException; + method public static void requestFonts(android.content.Context, android.provider.FontRequest, android.os.Handler, android.os.CancellationSignal, android.provider.FontsContract.FontRequestCallback); } public static final class FontsContract.Columns implements android.provider.BaseColumns { diff --git a/graphics/java/android/graphics/fonts/FontRequest.java b/core/java/android/provider/FontRequest.java similarity index 80% rename from graphics/java/android/graphics/fonts/FontRequest.java rename to core/java/android/provider/FontRequest.java index df3951c80b8e7..34114bcce195e 100644 --- a/graphics/java/android/graphics/fonts/FontRequest.java +++ b/core/java/android/provider/FontRequest.java @@ -13,11 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.graphics.fonts; +package android.provider; import android.annotation.NonNull; -import android.os.Parcel; -import android.os.Parcelable; import android.util.Base64; import com.android.internal.util.Preconditions; @@ -29,7 +27,7 @@ import java.util.List; /** * Information about a font request that may be sent to a Font Provider. */ -public final class FontRequest implements Parcelable { +public final class FontRequest { private final String mProviderAuthority; private final String mProviderPackage; private final String mQuery; @@ -114,42 +112,6 @@ public final class FontRequest implements Parcelable { return mIdentifier; } - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(mProviderAuthority); - dest.writeString(mProviderPackage); - dest.writeString(mQuery); - dest.writeList(mCertificates); - } - - private FontRequest(Parcel in) { - mProviderAuthority = in.readString(); - mProviderPackage = in.readString(); - mQuery = in.readString(); - mCertificates = new ArrayList<>(); - in.readList(mCertificates, null); - mIdentifier = new StringBuilder(mProviderAuthority).append("-").append(mProviderPackage) - .append("-").append(mQuery).toString(); - } - - public static final Parcelable.Creator CREATOR = - new Parcelable.Creator() { - @Override - public FontRequest createFromParcel(Parcel in) { - return new FontRequest(in); - } - - @Override - public FontRequest[] newArray(int size) { - return new FontRequest[size]; - } - }; - @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/core/java/android/provider/FontsContract.java b/core/java/android/provider/FontsContract.java index f6ad17d24dc21..6c038c787d59c 100644 --- a/core/java/android/provider/FontsContract.java +++ b/core/java/android/provider/FontsContract.java @@ -32,7 +32,6 @@ import android.content.pm.ProviderInfo; import android.content.pm.Signature; import android.database.Cursor; import android.graphics.Typeface; -import android.graphics.fonts.FontRequest; import android.graphics.fonts.FontVariationAxis; import android.net.Uri; import android.os.Bundle; diff --git a/core/tests/coretests/src/android/provider/FontsContractE2ETest.java b/core/tests/coretests/src/android/provider/FontsContractE2ETest.java index 51916ffce7266..29558696436d2 100644 --- a/core/tests/coretests/src/android/provider/FontsContractE2ETest.java +++ b/core/tests/coretests/src/android/provider/FontsContractE2ETest.java @@ -29,7 +29,6 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager; import android.content.pm.Signature; import android.graphics.Typeface; -import android.graphics.fonts.FontRequest; import android.os.Handler; import android.provider.FontsContract.Columns; import android.provider.FontsContract.FontFamilyResult; diff --git a/core/tests/coretests/src/android/provider/FontsContractTest.java b/core/tests/coretests/src/android/provider/FontsContractTest.java index ccc8c184fdf71..56bfbb0a646f4 100644 --- a/core/tests/coretests/src/android/provider/FontsContractTest.java +++ b/core/tests/coretests/src/android/provider/FontsContractTest.java @@ -32,7 +32,6 @@ import android.content.pm.PackageManager; import android.content.pm.ProviderInfo; import android.content.pm.Signature; import android.database.MatrixCursor; -import android.graphics.fonts.FontRequest; import android.graphics.fonts.FontVariationAxis.InvalidFormatException; import android.graphics.fonts.FontVariationAxis; import android.provider.FontsContract.FontInfo; diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index 60b1542671f43..ba62a08b6fcd7 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -29,7 +29,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.res.AssetManager; import android.graphics.FontListParser; -import android.graphics.fonts.FontRequest; import android.graphics.fonts.FontVariationAxis; import android.graphics.fonts.FontVariationAxis.InvalidFormatException; import android.net.Uri; @@ -37,6 +36,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.ParcelFileDescriptor; import android.os.ResultReceiver; +import android.provider.FontRequest; import android.provider.FontsContract; import android.text.FontConfig; import android.util.Base64; diff --git a/graphics/java/android/graphics/fonts/FontSpec.aidl b/graphics/java/android/graphics/fonts/FontSpec.aidl deleted file mode 100644 index dddea2560d3d6..0000000000000 --- a/graphics/java/android/graphics/fonts/FontSpec.aidl +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2017, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -package android.graphics.fonts; - -parcelable FontSpec; \ No newline at end of file