summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClark Scheff <clark@cyngn.com>2014-08-25 18:28:03 (GMT)
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-08-27 00:30:24 (GMT)
commit70563dfacb2e88cc01d81fa98d19e73d4aab6aa6 (patch)
tree5ab817a79d57855cf9a5e4bfc6c114a3127afa95
parent21df88b3e47c6ce768ae2f414c2eaf56b39da7ce (diff)
downloadandroid_packages_apps_Trebuchet-70563dfacb2e88cc01d81fa98d19e73d4aab6aa6.zip
android_packages_apps_Trebuchet-70563dfacb2e88cc01d81fa98d19e73d4aab6aa6.tar.gz
android_packages_apps_Trebuchet-70563dfacb2e88cc01d81fa98d19e73d4aab6aa6.tar.bz2
Revert "Handle theme changes"
This reverts commit 64718d775ce8322915d143adb9a0f1ea3160e9e3. Change-Id: Ibf92232dfa8ee96aafecc4b4e49fc55cfb21c229
-rw-r--r--AndroidManifest.xml6
-rw-r--r--src/com/android/launcher3/Launcher.java2
-rw-r--r--src/com/android/launcher3/ThemeChangedReceiver.java52
3 files changed, 1 insertions, 59 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0dd98d6..3de1bdf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -194,12 +194,6 @@
</intent-filter>
</receiver>
- <receiver android:name="com.android.launcher3.ThemeChangedReceiver" >
- <intent-filter>
- <action android:name="org.cyanogenmod.intent.action.THEME_CHANGED"/>
- </intent-filter>
- </receiver>
-
<!-- The settings provider contains Home's data, like the workspace favorites -->
<provider
android:name="com.android.launcher3.LauncherProvider"
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 01e3fc5..66b94e2 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();
diff --git a/src/com/android/launcher3/ThemeChangedReceiver.java b/src/com/android/launcher3/ThemeChangedReceiver.java
deleted file mode 100644
index 134a285..0000000
--- a/src/com/android/launcher3/ThemeChangedReceiver.java
+++ /dev/null
@@ -1,52 +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;
-
-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 '|' delimited string of the components that changed
- // due to a theme change.
- String components = intent.getStringExtra(EXTRA_COMPONENTS);
- if (components != null) {
- LauncherAppState.setApplicationContext(context.getApplicationContext());
- LauncherAppState app = LauncherAppState.getInstance();
- if (isInterestingThemeChange(components)) {
- 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(String components) {
- return components.contains(MODIFIES_ICONS) || components.contains(MODIFIES_FONTS) ||
- components.contains(MODIFIES_OVERLAYS);
- }
-}