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

* commit '1b89ad48536bc247d9611d374f733611cb8eaf13':
  DO NOT MERGE Fix bug where folder was almost transparent

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);

src/com/android/launcher2/Launcher.java

@@ -2242,6 +2242,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();
     }