summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-09-03 03:33:02 (GMT)
committerBrint E. Kriebel <bekit@cyngn.com>2014-09-03 03:33:02 (GMT)
commit9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532 (patch)
tree06c674c266a1699da404537c30a87e785963496f
parentc780ac1d535c3233b1d69471030759ed4f5e5a32 (diff)
parent93716e36397322fa24cbd3498c521732702d8836 (diff)
downloadandroid_packages_apps_Trebuchet-9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532.zip
android_packages_apps_Trebuchet-9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532.tar.gz
android_packages_apps_Trebuchet-9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532.tar.bz2
Merge branch 'cm-11.0' into stable/cm-11.0
-rw-r--r--AndroidManifest.xml6
-rw-r--r--res/values-af/cm_strings.xml2
-rw-r--r--src/com/android/launcher3/Launcher.java4
-rw-r--r--src/com/android/launcher3/ThemeChangedReceiver.java79
4 files changed, 4 insertions, 87 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/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 9d6173e..ef4a5a1 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -19,7 +19,7 @@
<string name="launcher_settings">LANSEERDER INSTELLINGS</string>
<string name="home_screen_settings">TUIS SKERM INSTELLINGS</string>
<string name="drawer_settings">LAAI INSTELLINGS</string>
- <string name="app_settings">PROG INSTELLINGS</string>
+ <string name="app_settings">PROGRAM INSTELLINGS</string>
<string name="setting_state_on">AAN</string>
<string name="setting_state_off">AF</string>
<string name="search_panel_gel">Google Now</string>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 01e3fc5..2223a5c 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 c7a98c5..0000000
--- 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();
- }
- }
- }
-}