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

Commit b2c20d88 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Unhide Typeface construction APIs. 

These APIs are necessary to construct Typeface from various combination
TTC index, variation settings, etc.

Bug: 33062398
Test: android.graphics.cts.TypefaceTest passes
Change-Id: Ie069700ed4f67efbec55331bef867f94d58e2a61
parent a300ab27

api/current.txt

+21 −0
Original line number Diff line number Diff line
@@ -13766,6 +13766,26 @@ package android.graphics { 
    field public static final android.graphics.Typeface SERIF;

  }













  public static final class Typeface.Builder {













    ctor public Typeface.Builder();













    method public android.graphics.Typeface build();













    method public static android.graphics.Typeface.Builder obtain();













    method public void recycle();













    method public void reset();













    method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String);













    method public android.graphics.Typeface.Builder setFontVariationSettings(android.text.FontConfig.Axis[]);













    method public android.graphics.Typeface.Builder setItalic(int);













    method public android.graphics.Typeface.Builder setSourceFromAsset(android.content.res.AssetManager, java.lang.String);













    method public android.graphics.Typeface.Builder setSourceFromFile(java.io.File);













    method public android.graphics.Typeface.Builder setSourceFromFile(java.io.FileDescriptor);













    method public android.graphics.Typeface.Builder setSourceFromFilePath(java.lang.String);













    method public android.graphics.Typeface.Builder setTtcIndex(int);













    method public android.graphics.Typeface.Builder setWeight(int);













    field public static final int ITALIC = 1; // 0x1













    field public static final int NORMAL = 0; // 0x0













    field public static final int RESOLVE_BY_FONT_TABLE = -1; // 0xffffffff













  }



























  public static abstract interface Typeface.FontRequestCallback {















    method public abstract void onTypefaceRequestFailed(int);















    method public abstract void onTypefaceRetrieved(android.graphics.Typeface);










@@ -41024,6 +41044,7 @@ package android.text {



























  public static final class FontConfig.Axis implements android.os.Parcelable {















    ctor public FontConfig.Axis(int, float);













    ctor public FontConfig.Axis(java.lang.String, float);















    method public int describeContents();















    method public float getStyleValue();















    method public int getTag();

























api/system-current.txt



+21
−0




























Original line number
Diff line number
Diff line








@@ -14499,6 +14499,26 @@ package android.graphics {













    field public static final android.graphics.Typeface SERIF;















  }



























  public static final class Typeface.Builder {













    ctor public Typeface.Builder();













    method public android.graphics.Typeface build();













    method public static android.graphics.Typeface.Builder obtain();













    method public void recycle();













    method public void reset();













    method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String);













    method public android.graphics.Typeface.Builder setFontVariationSettings(android.text.FontConfig.Axis[]);













    method public android.graphics.Typeface.Builder setItalic(int);













    method public android.graphics.Typeface.Builder setSourceFromAsset(android.content.res.AssetManager, java.lang.String);













    method public android.graphics.Typeface.Builder setSourceFromFile(java.io.File);













    method public android.graphics.Typeface.Builder setSourceFromFile(java.io.FileDescriptor);













    method public android.graphics.Typeface.Builder setSourceFromFilePath(java.lang.String);













    method public android.graphics.Typeface.Builder setTtcIndex(int);













    method public android.graphics.Typeface.Builder setWeight(int);













    field public static final int ITALIC = 1; // 0x1













    field public static final int NORMAL = 0; // 0x0













    field public static final int RESOLVE_BY_FONT_TABLE = -1; // 0xffffffff













  }



























  public static abstract interface Typeface.FontRequestCallback {















    method public abstract void onTypefaceRequestFailed(int);















    method public abstract void onTypefaceRetrieved(android.graphics.Typeface);










@@ -44486,6 +44506,7 @@ package android.text {



























  public static final class FontConfig.Axis implements android.os.Parcelable {















    ctor public FontConfig.Axis(int, float);













    ctor public FontConfig.Axis(java.lang.String, float);















    method public int describeContents();















    method public float getStyleValue();















    method public int getTag();

























api/test-current.txt



+21
−0




























Original line number
Diff line number
Diff line








@@ -13804,6 +13804,26 @@ package android.graphics {













    field public static final android.graphics.Typeface SERIF;















  }



























  public static final class Typeface.Builder {













    ctor public Typeface.Builder();













    method public android.graphics.Typeface build();













    method public static android.graphics.Typeface.Builder obtain();













    method public void recycle();













    method public void reset();













    method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String);













    method public android.graphics.Typeface.Builder setFontVariationSettings(android.text.FontConfig.Axis[]);













    method public android.graphics.Typeface.Builder setItalic(int);













    method public android.graphics.Typeface.Builder setSourceFromAsset(android.content.res.AssetManager, java.lang.String);













    method public android.graphics.Typeface.Builder setSourceFromFile(java.io.File);













    method public android.graphics.Typeface.Builder setSourceFromFile(java.io.FileDescriptor);













    method public android.graphics.Typeface.Builder setSourceFromFilePath(java.lang.String);













    method public android.graphics.Typeface.Builder setTtcIndex(int);













    method public android.graphics.Typeface.Builder setWeight(int);













    field public static final int ITALIC = 1; // 0x1













    field public static final int NORMAL = 0; // 0x0













    field public static final int RESOLVE_BY_FONT_TABLE = -1; // 0xffffffff













  }



























  public static abstract interface Typeface.FontRequestCallback {















    method public abstract void onTypefaceRequestFailed(int);















    method public abstract void onTypefaceRetrieved(android.graphics.Typeface);










@@ -41219,6 +41239,7 @@ package android.text {



























  public static final class FontConfig.Axis implements android.os.Parcelable {















    ctor public FontConfig.Axis(int, float);













    ctor public FontConfig.Axis(java.lang.String, float);















    method public int describeContents();















    method public float getStyleValue();















    method public int getTag();

























core/java/android/text/FontConfig.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -111,7 +111,6 @@ public final class FontConfig implements Parcelable {













            mStyleValue = styleValue;















        }





























        /** @hide */















        public Axis(@NonNull String tagString, float styleValue) {















            if (!FontListParser.isValidTag(tagString)) {















                throw new IllegalArgumentException("Invalid tag pattern: " + tagString);

































graphics/java/android/graphics/Typeface.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -477,7 +477,6 @@ public class Typeface {













     *















     * <p>Note that only one source can be specified for the single Typeface.</p>















     */













    /** @hide TODO: Make this API public. */















    public static final class Builder {















        /**















         * Value for weight and italic.