Add boolean parameter to specify if label should be visible.

The additional cards don't animate the label in so they need
it to be visible from within the expand() method.  The cards that
are visible in the preview, that animate into cards need the label
to not be visible since it will be faded in.

Change-Id: I89a572a481d2d753118225c102dac0f7e99739ba

3 files changed, 7 insertions, 6 deletions

diff --git a/src/org/cyanogenmod/theme/chooserv2/ComponentCardView.java b/src/org/cyanogenmod/theme/chooserv2/ComponentCardView.java
index 8154229..5e24c95 100644
--- a/src/org/cyanogenmod/theme/chooserv2/ComponentCardView.java
+++ b/src/org/cyanogenmod/theme/chooserv2/ComponentCardView.java
@@ -59,7 +59,7 @@ public class ComponentCardView extends LinearLayout {
                 (int) r.getDimension(R.dimen.card_padding_bottom) + getPaddingBottom();
     }
 
-    public void expand() {
+    public void expand(boolean showLabel) {
         TransitionDrawable bg = null;
         if (getBackground() instanceof TransitionDrawable) {
             bg = (TransitionDrawable) getBackground();
@@ -72,7 +72,7 @@ public class ComponentCardView extends LinearLayout {
         setPadding(mExpandPadLeft, mExpandPadTop, mExpandPadRight, mExpandPadBottom);
 
         if (mLabel != null) {
-            mLabel.setAlpha(1f);
+            mLabel.setAlpha(showLabel ? 1f : 0f);
             mLabel.setVisibility(View.VISIBLE);
         }
     }
@@ -82,7 +82,8 @@ public class ComponentCardView extends LinearLayout {
             TransitionDrawable background = (TransitionDrawable) getBackground();
             if (mLabel != null) {
                 mLabel.setVisibility(View.VISIBLE);
-                mLabel.animate().alpha(1f).setDuration(CARD_FADE_DURATION);
+                mLabel.setAlpha(0f);
+                mLabel.animate().alpha(1f).setDuration(CARD_FADE_DURATION).start();
             }
             background.startTransition(CARD_FADE_DURATION);
         }
diff --git a/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java b/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java
index 633d24c..31159d0 100644
--- a/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java
+++ b/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java
@@ -462,7 +462,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
             }
 
             child.setLayoutParams(lparams);
-            child.expand();
+            child.expand(false);
         }
 
         // Expand the additional children.
@@ -472,7 +472,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
             if (v instanceof ComponentCardView) {
                 ComponentCardView card = (ComponentCardView) v;
                 card.setVisibility(View.VISIBLE);
-                card.expand();
+                card.expand(true);
             }
         }
 
diff --git a/src/org/cyanogenmod/theme/chooserv2/WallpaperCardView.java b/src/org/cyanogenmod/theme/chooserv2/WallpaperCardView.java
index a2adf0c..41c87f8 100644
--- a/src/org/cyanogenmod/theme/chooserv2/WallpaperCardView.java
+++ b/src/org/cyanogenmod/theme/chooserv2/WallpaperCardView.java
@@ -56,7 +56,7 @@ public class WallpaperCardView extends ComponentCardView {
     }
 
     @Override
-    public void expand() {
+    public void expand(boolean showLabel) {
         // Do nothing
     }