Reapply theme components when theme updated.

Change-Id: Ia841ae6ef466e0b60016fab47abfe4c1089cc902

1 files changed, 22 insertions, 0 deletions

diff --git a/src/org/cyanogenmod/themes/provider/ThemePackageHelper.java b/src/org/cyanogenmod/themes/provider/ThemePackageHelper.java
index 1df0442..d602315 100644
--- a/src/org/cyanogenmod/themes/provider/ThemePackageHelper.java
+++ b/src/org/cyanogenmod/themes/provider/ThemePackageHelper.java
@@ -156,6 +156,9 @@ public class ThemePackageHelper {
             } else if (pi.isLegacyIconPackApk) {
                 updateLegacyIconPackInternal(context, pi, capabilities);
             }
+
+            // We should reapply any components that are currently applied for this theme.
+            reapplyInstalledComponentsForTheme(context, pkgName);
         }
     }
 
@@ -348,4 +351,23 @@ public class ThemePackageHelper {
         }
         return count >= 2;
     }
+
+    private static void reapplyInstalledComponentsForTheme(Context context, String pkgName) {
+        List<String> reApply = new LinkedList<String>(); // components to re-apply
+        Cursor mixnmatch = context.getContentResolver().query(MixnMatchColumns.CONTENT_URI,
+                null, null, null, null);
+        while (mixnmatch.moveToNext()) {
+            String mixnmatchKey = mixnmatch.getString(mixnmatch
+                    .getColumnIndex(MixnMatchColumns.COL_KEY));
+            String component = ThemesContract.MixnMatchColumns
+                    .mixNMatchKeyToComponent(mixnmatchKey);
+            String pkg = mixnmatch.getString(
+                    mixnmatch.getColumnIndex(MixnMatchColumns.COL_VALUE));
+            if (pkgName.equals(pkg)) {
+                reApply.add(component);
+            }
+        }
+        ThemeManager manager = (ThemeManager) context.getSystemService(Context.THEME_SERVICE);
+        manager.requestThemeChange(pkgName, reApply);
+    }
 }