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

Commit 8fcdd2fd authored by d34d's avatar d34d Committed by Clark Scheff
Browse files

Themes: Allow packages to be set as non-themeable 

This patch allows for specific packages to be declared as non
themeable.  Packages that are non themeable will not have theme
resources attached to their assets when their Resources object
is created.

This patch also removes isThemeable from CompatibilityInfo as this
object did not correctly reflect that the package is not themeable.

Change-Id: Id34c63ec0c3ef7c69df083da63559e0720ce0018
REF: CYNGNOS-770
parent 4d36295c

core/java/android/app/ActivityThread.java

+3 −2
Original line number Diff line number Diff line
@@ -1667,7 +1667,7 @@ public final class ActivityThread { 
            LoadedApk pkgInfo, Context context, String pkgName) {

        return mResourcesManager.getTopLevelResources(resDir, splitResDirs, overlayDirs, libDirs,

                displayId, pkgName, overrideConfiguration, pkgInfo.getCompatibilityInfo(), null,

                context);

                context, pkgInfo.getApplicationInfo().isThemeable);

    }



    /**
@@ -1676,7 +1676,8 @@ public final class ActivityThread { 
    Resources getTopLevelThemedResources(String resDir, int displayId, LoadedApk pkgInfo,

                                         String pkgName, String themePkgName) {

        return mResourcesManager.getTopLevelThemedResources(resDir, displayId, pkgName,

                themePkgName, pkgInfo.getCompatibilityInfo(), null);

                themePkgName, pkgInfo.getCompatibilityInfo(), null,

                pkgInfo.getApplicationInfo().isThemeable);

    }



    final Handler getHandler() {

core/java/android/app/ContextImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -2344,9 +2344,10 @@ class ContextImpl extends Context { 
                        packageInfo.getOverlayDirs(),

                        packageInfo.getApplicationInfo().sharedLibraryFiles, displayId,

                        packageInfo.getAppDir(), overrideConfiguration, compatInfo, activityToken,

                        mOuterContext) :

                        mOuterContext, packageInfo.getApplicationInfo().isThemeable) :

                mResourcesManager.getTopLevelThemedResources(packageInfo.getResDir(), displayId,

                        packageInfo.getPackageName(), themePackageName, compatInfo ,activityToken);

                        packageInfo.getPackageName(), themePackageName, compatInfo, activityToken,

                        packageInfo.getApplicationInfo().isThemeable);

            }

        }

        mResources = resources;

core/java/android/app/ResourcesManager.java

+21 −21
Original line number Diff line number Diff line
@@ -174,9 +174,8 @@ public class ResourcesManager { 
    public Resources getTopLevelResources(String resDir, String[] splitResDirs,

            String[] overlayDirs, String[] libDirs, int displayId, String packageName,

            Configuration overrideConfiguration, CompatibilityInfo compatInfo, IBinder token,

            Context context) {

            Context context, boolean isThemeable) {

        final float scale = compatInfo.applicationScale;

        final boolean isThemeable = compatInfo.isThemeable;

        final ThemeConfig themeConfig = getThemeConfig();

        ResourcesKey key = new ResourcesKey(resDir, displayId, overrideConfiguration, scale,

                isThemeable, themeConfig, token);
@@ -205,7 +204,7 @@ public class ResourcesManager { 


        AssetManager assets = new AssetManager();

        assets.setAppName(packageName);

        assets.setThemeSupport(compatInfo.isThemeable);

        assets.setThemeSupport(isThemeable);

        // resDir can be null if the 'android' package is creating a new Resources object.

        // This is fine, since each AssetManager automatically loads the 'android' package

        // already.
@@ -257,7 +256,7 @@ public class ResourcesManager { 


        boolean iconsAttached = false;

        /* Attach theme information to the resulting AssetManager when appropriate. */

        if (compatInfo.isThemeable && config != null && !context.getPackageManager().isSafeMode()) {

        if (isThemeable && config != null && !context.getPackageManager().isSafeMode()) {

            if (config.themeConfig == null) {

                try {

                    config.themeConfig = ThemeConfig.getBootTheme(context.getContentResolver());
@@ -308,15 +307,14 @@ public class ResourcesManager { 
     *

     * @hide

     */

    public Resources getTopLevelThemedResources(String resDir, int displayId,

                                                String packageName,

                                                String themePackageName,

                                                CompatibilityInfo compatInfo, IBinder token) {

    public Resources getTopLevelThemedResources(String resDir, int displayId, String packageName,

            String themePackageName, CompatibilityInfo compatInfo, IBinder token,

            boolean isThemeable) {

        Resources r;



        AssetManager assets = new AssetManager();

        assets.setAppName(packageName);

        assets.setThemeSupport(true);

        assets.setThemeSupport(isThemeable);

        if (assets.addAssetPath(resDir) == 0) {

            return null;

        }
@@ -332,6 +330,8 @@ public class ResourcesManager { 
            config = getConfiguration();

        }



        boolean iconsAttached = false;

        if (isThemeable) {

            /* Attach theme information to the resulting AssetManager when appropriate. */

            ThemeConfig.Builder builder = new ThemeConfig.Builder();

            builder.defaultOverlay(themePackageName);
@@ -341,10 +341,10 @@ public class ResourcesManager { 
            ThemeConfig themeConfig = builder.build();

            attachThemeAssets(assets, themeConfig);

            attachCommonAssets(assets, themeConfig);

        attachIconAssets(assets, themeConfig);



            iconsAttached = attachIconAssets(assets, themeConfig);

        }

        r = new Resources(assets, dm, config, compatInfo, token);

        setActivityIcons(r);

        if (iconsAttached) setActivityIcons(r);



        return r;

    }

core/java/android/content/pm/PackageParser.java

+19 −2
Original line number Diff line number Diff line
@@ -2577,8 +2577,9 @@ public class PackageParser { 
        final ApplicationInfo ai = owner.applicationInfo;

        final String pkgName = owner.applicationInfo.packageName;



        // assume that this package is themeable unless explicitly set to false.

        ai.isThemeable = true;

        String[] nonThemeablePackages =

                res.getStringArray(com.android.internal.R.array.non_themeable_packages);

        ai.isThemeable = isPackageThemeable(pkgName, nonThemeablePackages);



        TypedArray sa = res.obtainAttributes(attrs,

                com.android.internal.R.styleable.AndroidManifestApplication);
@@ -4377,6 +4378,22 @@ public class PackageParser { 
        return true;

    }



    /**1

     * Returns whether the specified package is themeable

     * @param packageName Name of package to check

     * @param nonThemeablePackages Array of packages that are declared as non-themeable

     * @return True if the package is themeable, false otherwise

     */

    private static boolean isPackageThemeable(String packageName, String[] nonThemeablePackages) {

        for (String pkg : nonThemeablePackages) {

            if (packageName.startsWith(pkg)) {

                return false;

            }

        }



        return true;

    }



    /**

     * Representation of a full package parsed from APK files on disk. A package

     * consists of a single base APK, and zero or more split APKs.

core/java/android/content/res/CompatibilityInfo.java

+2 −15
Original line number Diff line number Diff line
@@ -92,15 +92,9 @@ public class CompatibilityInfo implements Parcelable { 
     */

    public final float applicationInvertedScale;



    /**

     * Whether the application supports third-party theming.

     */

    public final boolean isThemeable;



    public CompatibilityInfo(ApplicationInfo appInfo, int screenLayout, int sw,

            boolean forceCompat) {

        int compatFlags = 0;

        isThemeable = appInfo.isThemeable;



        if (appInfo.requiresSmallestWidthDp != 0 || appInfo.compatibleWidthLimitDp != 0

                || appInfo.largestWidthLimitDp != 0) {
@@ -247,20 +241,17 @@ public class CompatibilityInfo implements Parcelable { 
        mCompatibilityFlags = compatFlags;

    }



    private CompatibilityInfo(int compFlags,

            int dens, float scale, float invertedScale, boolean isThemeable) {

    private CompatibilityInfo(int compFlags, int dens, float scale, float invertedScale) {

        mCompatibilityFlags = compFlags;

        applicationDensity = dens;

        applicationScale = scale;

        applicationInvertedScale = invertedScale;

        this.isThemeable = isThemeable;

    }



    private CompatibilityInfo() {

        this(NEVER_NEEDS_COMPAT, DisplayMetrics.DENSITY_DEVICE,

                1.0f,

                1.0f,

                true);

                1.0f);

    }



    /**
@@ -534,7 +525,6 @@ public class CompatibilityInfo implements Parcelable { 
            if (applicationDensity != oc.applicationDensity) return false;

            if (applicationScale != oc.applicationScale) return false;

            if (applicationInvertedScale != oc.applicationInvertedScale) return false;

            if (isThemeable != oc.isThemeable) return false;

            return true;

        } catch (ClassCastException e) {

            return false;
@@ -572,7 +562,6 @@ public class CompatibilityInfo implements Parcelable { 
        result = 31 * result + applicationDensity;

        result = 31 * result + Float.floatToIntBits(applicationScale);

        result = 31 * result + Float.floatToIntBits(applicationInvertedScale);

        result = 31 * result + (isThemeable ? 1 : 0);

        return result;

    }
@@ -587,7 +576,6 @@ public class CompatibilityInfo implements Parcelable { 
        dest.writeInt(applicationDensity);

        dest.writeFloat(applicationScale);

        dest.writeFloat(applicationInvertedScale);

        dest.writeInt(isThemeable ? 1 : 0);

    }



    public static final Parcelable.Creator<CompatibilityInfo> CREATOR
@@ -608,6 +596,5 @@ public class CompatibilityInfo implements Parcelable { 
        applicationDensity = source.readInt();

        applicationScale = source.readFloat();

        applicationInvertedScale = source.readFloat();

        isThemeable = source.readInt() == 1 ? true : false;

    }

}