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

Commit 02761acc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Declarative downloadable fonts"

parents a10b057b 4b5a4d22

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -601,6 +601,8 @@ 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 = 16844114; // 0x1010552

    field public static final int fontProviderQuery = 16844115; // 0x1010553

    field public static final int fontStyle = 16844081; // 0x1010531

    field public static final int fontWeight = 16844083; // 0x1010533

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -713,6 +713,8 @@ 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 = 16844114; // 0x1010552

    field public static final int fontProviderQuery = 16844115; // 0x1010553

    field public static final int fontStyle = 16844081; // 0x1010531

    field public static final int fontWeight = 16844083; // 0x1010533

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -601,6 +601,8 @@ 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 = 16844114; // 0x1010552

    field public static final int fontProviderQuery = 16844115; // 0x1010553

    field public static final int fontStyle = 16844081; // 0x1010531

    field public static final int fontWeight = 16844083; // 0x1010533

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

core/java/android/app/ActivityThread.java

+18 −0
Original line number Diff line number Diff line
@@ -5722,6 +5722,24 @@ public final class ActivityThread { 
        } finally {

            StrictMode.setThreadPolicy(savedPolicy);

        }



        // Preload fonts resources

        try {

            final ApplicationInfo info =

                    sPackageManager.getApplicationInfo(

                            data.appInfo.packageName,

                            PackageManager.GET_META_DATA /*flags*/,

                            UserHandle.myUserId());

            if (info.metaData != null) {

                final int preloadedFontsResource = info.metaData.getInt(

                        ApplicationInfo.METADATA_PRELOADED_FONTS, 0);

                if (preloadedFontsResource != 0) {

                    data.info.mResources.preloadFonts(preloadedFontsResource);

                }

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /*package*/ final void finishInstrumentation(int resultCode, Bundle results) {

core/java/android/content/pm/ApplicationInfo.java

+5 −0
Original line number Diff line number Diff line
@@ -572,6 +572,11 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     */

    public int privateFlags;



    /**

     * @hide

     */

    public static final String METADATA_PRELOADED_FONTS = "preloaded_fonts";



    /**

     * The required smallest screen width the application can run on.  If 0,

     * nothing has been specified.  Comes from