diff options
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/ThemeChangedReceiver.java | 79 |
2 files changed, 3 insertions, 80 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 01e3fc584..2223a5c1e 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -622,7 +622,7 @@ public class Launcher extends Activity CustomContentMode.DISABLED.getValue())); } - void initializeDynamicGrid() { + private void initializeDynamicGrid() { LauncherAppState.setApplicationContext(getApplicationContext()); LauncherAppState app = LauncherAppState.getInstance(); @@ -2754,6 +2754,8 @@ public class Launcher extends Activity if (mAppsCustomizeContent.getContentType() == AppsCustomizePagedView.ContentType.Applications) { showWorkspace(true); + // Background was set to gradient in onPause(), restore to black if in all apps. + setWorkspaceBackground(mState == State.WORKSPACE); } else { showOverviewMode(true); } diff --git a/src/com/android/launcher3/ThemeChangedReceiver.java b/src/com/android/launcher3/ThemeChangedReceiver.java deleted file mode 100644 index c7a98c5ab..000000000 --- a/src/com/android/launcher3/ThemeChangedReceiver.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2014 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 static com.android.launcher3.WidgetPreviewLoader.CacheDb.DB_NAME; - -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<String> components = intent.getStringArrayListExtra(EXTRA_COMPONENTS); - if (isInterestingThemeChange(components)) { - LauncherAppState app = LauncherAppState.getInstance(); - 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<String> 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; - } - - - /** - * Normally we could use context.deleteDatabase() but this db is in cache/ so we'll - * manually delete it and the journal ourselves. - * - * @param context - */ - private void clearWidgetPreviewCache(Context context) { - File[] files = context.getCacheDir().listFiles(); - if (files != null) { - for (File f : files) { - if (!f.isDirectory() && f.getName().startsWith(DB_NAME)) f.delete(); - } - } - } -} |