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

2 files changed, 21 insertions, 17 deletions

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 7653c39..b4af2c9 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -2582,8 +2582,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);
@@ -4443,6 +4444,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.
diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java
index 47d5d05..2b8951e 100644
--- a/core/java/android/content/res/CompatibilityInfo.java
+++ b/core/java/android/content/res/CompatibilityInfo.java
@@ -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;
     }
 }