summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-05-06 12:20:03 -0700
committerd34d <clark@cyngn.com>2016-05-06 12:20:03 -0700
commit75bae064f51a6b0640767d5c583cfd4b1e738bae (patch)
treeea017da52837912ca7813e03541723ec2899aa58
parent2e21c73a35053a54ee75abc3283b6fde19772d29 (diff)
downloadpackages_apps_ThemeChooser-75bae064f51a6b0640767d5c583cfd4b1e738bae.zip
packages_apps_ThemeChooser-75bae064f51a6b0640767d5c583cfd4b1e738bae.tar.gz
packages_apps_ThemeChooser-75bae064f51a6b0640767d5c583cfd4b1e738bae.tar.bz2
Check if theme is applying in onResume
Make sure mThemeChanging reflects what the ThemeManager returns from isThemeApplying() Change-Id: I4c3d2bac7b48d173a3f3c376971339e127d3476b TICKET: FEIJ-443
-rw-r--r--src/com/cyngn/theme/chooser/ChooserActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/cyngn/theme/chooser/ChooserActivity.java b/src/com/cyngn/theme/chooser/ChooserActivity.java
index 024b19e..b1f943f 100644
--- a/src/com/cyngn/theme/chooser/ChooserActivity.java
+++ b/src/com/cyngn/theme/chooser/ChooserActivity.java
@@ -60,6 +60,7 @@ import com.cyngn.theme.util.Utils;
import cyanogenmod.platform.Manifest;
import cyanogenmod.providers.ThemesContract;
import cyanogenmod.providers.ThemesContract.ThemesColumns;
+import cyanogenmod.themes.ThemeManager;
import java.util.ArrayList;
import java.util.HashMap;
@@ -677,7 +678,8 @@ public class ChooserActivity extends FragmentActivity
// clear out any notifications that are being displayed.
NotificationHelper.cancelNotifications(this);
- mThemeChanging = false;
+ ThemeManager tm = ThemeManager.getInstance(this);
+ mThemeChanging = tm.isThemeApplying();
if (!mIsPickingImage) {
startLoader(LOADER_ID_APPLIED);