Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 080b054b authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

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
parent 1c661d19

api/current.txt

+11 −14
Original line number Diff line number Diff line
@@ -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<java.util.List<byte[]>>);













    method public int describeContents();













    method public java.util.List<java.util.List<byte[]>> 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<android.graphics.fonts.FontRequest> 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<java.util.List<byte[]>>);













    method public java.util.List<java.util.List<byte[]>> 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 {

























api/system-current.txt



+11
−14




























Original line number
Diff line number
Diff line








@@ -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<java.util.List<byte[]>>);













    method public int describeContents();













    method public java.util.List<java.util.List<byte[]>> 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<android.graphics.fonts.FontRequest> 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<java.util.List<byte[]>>);













    method public java.util.List<java.util.List<byte[]>> 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 {

























api/test-current.txt



+11
−14




























Original line number
Diff line number
Diff line








@@ -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<java.util.List<byte[]>>);













    method public int describeContents();













    method public java.util.List<java.util.List<byte[]>> 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<android.graphics.fonts.FontRequest> 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<java.util.List<byte[]>>);













    method public java.util.List<java.util.List<byte[]>> 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 {

























graphics/java/android/graphics/fonts/FontRequest.java→core/java/android/provider/FontRequest.java



+2
−40




























Original line number
Diff line number
Diff line








@@ -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<FontRequest> CREATOR =













            new Parcelable.Creator<FontRequest>() {













                @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();

































core/java/android/provider/FontsContract.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -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;