commit 7725c79a80f0962c7e1cb38a3405d0676d184ee1
author Michael Jurka <mikejurka@google.com> Fri May 03 11:40:51 2013 +0200
committer Michael Jurka <mikejurka@google.com> Fri May 03 15:52:29 2013 +0200
tree 48a14174fa38d509943c277862f6de750d65f705
parent 81426b9bfee67c1313f59629e9dca523fe2c46d1

DO NOT MERGE Fix bug where folder was almost transparent

Bug: 8775089

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 0aab2ac..50be940 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2244,6 +2244,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();
     }