Make sure the Shop Themes buttons comes back whenever we collapse

The way it was setup, the shop themes button would only animate
back in when the back button is pressed from an expanded theme.
We now hide/show shop themes in setAnimatingStateAndScheduleFinish()
which solves this issue.

Change-Id: Ie951a93d77ee2c3c89df44cb9b1e1bd7f865dd71

1 files changed, 5 insertions, 2 deletions

diff --git a/src/com/cyngn/theme/chooser/ChooserActivity.java b/src/com/cyngn/theme/chooser/ChooserActivity.java
index 567cb85..15b5146 100644
--- a/src/com/cyngn/theme/chooser/ChooserActivity.java
+++ b/src/com/cyngn/theme/chooser/ChooserActivity.java
@@ -276,6 +276,11 @@ public class ChooserActivity extends FragmentActivity
                 mContainer.setIsAnimating(false);
             }
         }, FINISH_ANIMATION_DELAY);
+        if (mExpanded) {
+            hideShopThemesLayout();
+        } else {
+            showShopThemesLayout();
+        }
     }
 
     private void setCustomBackground(final ImageView iv) {
@@ -402,7 +407,6 @@ public class ChooserActivity extends FragmentActivity
                 f.expand();
             }
             setAnimatingStateAndScheduleFinish();
-            hideShopThemesLayout();
         }
     }
 
@@ -463,7 +467,6 @@ public class ChooserActivity extends FragmentActivity
                     }
                 });
             }
-            showShopThemesLayout();
             setAnimatingStateAndScheduleFinish();
         } else {
             if (f != null && f.isShowingApplyThemeLayout()) {