commit 1b89ad48536bc247d9611d374f733611cb8eaf13
author Michael Jurka <mikejurka@google.com> Wed May 08 17:52:06 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 08 17:52:06 2013 +0000
tree 14c8c8638499da31c33841c62744c0d229ac43cf
parent d80dc80dbf15f0329a085b21e6e6e4c993e68505
parent 7725c79a80f0962c7e1cb38a3405d0676d184ee1

Merge "DO NOT MERGE Fix bug where folder was almost transparent" into jb-mr2-dev

src/com/android/launcher2/Folder.java

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index e8be3ef..6b32882 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -441,6 +441,9 @@
                     cling.bringToFront();
                 }
                 setFocusOnFirstChild();
+                setAlpha(1);
+                setScaleX(1);
+                setScaleY(1);
             }
         });
         oa.setDuration(mExpandDuration);

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 7437eac..7f90c81 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2242,6 +2242,14 @@
         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();
     }