DO NOT MERGE Fix bug where folder was almost transparent

Bug: 8775089

2 files changed, 11 insertions, 0 deletions

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index e8be3eff2..6b3288217 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -441,6 +441,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
                     cling.bringToFront();
                 }
                 setFocusOnFirstChild();
+                setAlpha(1);
+                setScaleX(1);
+                setScaleY(1);
             }
         });
         oa.setDuration(mExpandDuration);
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 0aab2acaf..50be94061 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2244,6 +2244,14 @@ public final class Launcher extends Activity
         ObjectAnimator oa = LauncherAnimUtils.ofPropertyValuesHolder(mFolderIconImageView, alpha,
                 scaleX, scaleY);
         oa.setDuration(getResources().getInteger(R.integer.config_folderAnimDuration));
+        oa.addListener(new AnimatorListenerAdapter() {
+                public void onAnimationEnd(Animator animation) {
+                    if (mFolderIconImageView != null) {
+                        mFolderIconImageView.setAlpha(0);
+                        mFolderIconImageView.setScalex(1.5f);
+                        mFolderIconImageView.setScalex(1.5f);
+                    }
+                }
         oa.start();
     }