Allow loaders to finish if expanded and activity resuming

Change-Id: I7df5fc5bef723d6d1c8602ff03350f31978b20ff
REF:TOMATO-662

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 461da86..d8a5f89 100644
--- a/src/com/cyngn/theme/chooser/ChooserActivity.java
+++ b/src/com/cyngn/theme/chooser/ChooserActivity.java
@@ -133,6 +133,7 @@ public class ChooserActivity extends FragmentActivity
 
     private boolean mIsPickingImage = false;
     private boolean mRestartLoaderOnCollapse = false;
+    private boolean mActivityResuming = false;
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -768,7 +769,7 @@ public class ChooserActivity extends FragmentActivity
     public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
         if (mThemeChanging) return;
 
-        if (mExpanded) {
+        if (mExpanded && !mActivityResuming) {
             mRestartLoaderOnCollapse = true;
             return;
         }
@@ -801,6 +802,7 @@ public class ChooserActivity extends FragmentActivity
                     }
                 }
                 if (mAnimateContentIn) animateContentIn();
+                mActivityResuming = true;
                 break;
             case LOADER_ID_APPLIED:
                 startLoader(LOADER_ID_INSTALLED_THEMES);