From a343529cc30489de6c78870277311720630f524d Mon Sep 17 00:00:00 2001 From: Clark Scheff Date: Tue, 10 Jun 2014 15:01:34 -0700 Subject: Handle theme changes issue-id: CYNGNOS-1434 NIGHTLIES-2149 Change-Id: I85208f3d6b572fb7a161db79cd3b74c1102dbba2 (cherry picked from commit 50f78e36b079bbe14bcb50064d28940358d42544) --- AndroidManifest.xml | 6 ++ src/com/android/launcher3/IconCache.java | 13 +++- src/com/android/launcher3/LauncherAppState.java | 4 ++ .../android/launcher3/ThemeChangedReceiver.java | 70 ++++++++++++++++++++++ src/com/android/launcher3/WidgetPreviewLoader.java | 9 ++- 5 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 src/com/android/launcher3/ThemeChangedReceiver.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c8c0ec4b6..21023ae8e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -214,6 +214,12 @@ + + + + + + mCache = new HashMap(INITIAL_ICON_CACHE_CAPACITY); private final int mIconDpi; - @Thunk final IconDB mIconDb; + @Thunk IconDB mIconDb; @Thunk final Handler mWorkerHandler; @@ -199,6 +199,17 @@ public class IconCache { mCache.remove(new ComponentKey(componentName, user)); } + /** + * Empty out the cache. + */ + public synchronized void flush() { + mCache.clear(); + if (mIconDb != null) { + mIconDb.close(); + } + mIconDb = new IconDB(mContext); + } + /** * Empty out the cache that aren't of the correct grid size */ diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index d515f05e5..d2a9b2641 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -124,6 +124,10 @@ public class LauncherAppState { mModel.startLoaderFromBackground(); } + public void recreateWidgetPreviewDb() { + mWidgetCache.recreateWidgetPreviewDb(); + } + LauncherModel setLauncher(Launcher launcher) { getLauncherProvider().setLauncherProviderChangeListener(launcher); mModel.initialize(launcher); diff --git a/src/com/android/launcher3/ThemeChangedReceiver.java b/src/com/android/launcher3/ThemeChangedReceiver.java new file mode 100644 index 000000000..9af5da4b7 --- /dev/null +++ b/src/com/android/launcher3/ThemeChangedReceiver.java @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2015 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; + +import java.io.File; +import java.util.ArrayList; + +public class ThemeChangedReceiver extends BroadcastReceiver { + private static final String EXTRA_COMPONENTS = "components"; + + public static final String MODIFIES_ICONS = "mods_icons"; + public static final String MODIFIES_FONTS = "mods_fonts"; + public static final String MODIFIES_OVERLAYS = "mods_overlays"; + + public void onReceive(Context context, Intent intent) { + // components is a string array of the components that changed + ArrayList components = intent.getStringArrayListExtra(EXTRA_COMPONENTS); + if (isInterestingThemeChange(components)) { + LauncherAppState app = LauncherAppState.getInstance(); + clearAppIconCache(context); + clearWidgetPreviewCache(context); + app.recreateWidgetPreviewDb(); + app.getIconCache().flush(); + app.getModel().forceReload(); + } + } + + /** + * We consider this an "interesting" theme change if it modifies icons, overlays, or fonts. + * @param components + * @return + */ + private boolean isInterestingThemeChange(ArrayList components) { + if (components != null) { + for (String component : components) { + if (component.equals(MODIFIES_ICONS) || + component.equals(MODIFIES_FONTS) || + component.equals(MODIFIES_OVERLAYS)) { + return true; + } + } + } + return false; + } + + private void clearWidgetPreviewCache(Context context) { + context.deleteDatabase(LauncherFiles.WIDGET_PREVIEWS_DB); + } + + private void clearAppIconCache(Context context) { + context.deleteDatabase(LauncherFiles.APP_ICONS_DB); + } +} diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index 346055566..056bdec53 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -66,7 +66,7 @@ public class WidgetPreviewLoader { private final IconCache mIconCache; private final UserManagerCompat mUserManager; private final AppWidgetManagerCompat mManager; - private final CacheDb mDb; + private CacheDb mDb; private final int mProfileBadgeMargin; private final MainThreadExecutor mMainThreadExecutor = new MainThreadExecutor(); @@ -83,6 +83,13 @@ public class WidgetPreviewLoader { .getDimensionPixelSize(R.dimen.profile_badge_margin); } + public void recreateWidgetPreviewDb() { + if (mDb != null) { + mDb.close(); + } + mDb = new CacheDb(mContext); + } + /** * Generates the widget preview on {@link AsyncTask#THREAD_POOL_EXECUTOR}. Must be * called on UI thread -- cgit v1.2.3