1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 4763172c9..2e73c5749 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -791,10 +791,18 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         if (mPowerManager.isPowerSaveMode() || animatorDurationScale < 0.01f) {
             // power save mode is no fun - skip alpha animation and just set it to 0
             // otherwise the icons will stay around until the duration of the animation
-            oa = LauncherAnimUtils.ofPropertyValuesHolder(this, translationY);
+            if (animate) {
+                oa = LauncherAnimUtils.ofPropertyValuesHolder(this, translationY);
+            } else {
+                oa = LauncherAnimUtils.ofPropertyValuesHolder(this);
+            }
             setAlpha(0f);
         } else {
-            oa = LauncherAnimUtils.ofPropertyValuesHolder(this, alpha, translationY);
+            if (animate) {
+                oa = LauncherAnimUtils.ofPropertyValuesHolder(this, alpha, translationY);
+            } else {
+                oa = LauncherAnimUtils.ofPropertyValuesHolder(this, alpha);
+            }
         }
 
         oa.setDuration(mMaterialExpandDuration);