diff options
author | Michael Jurka <mikejurka@google.com> | 2013-05-08 17:52:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-08 17:52:06 +0000 |
commit | 1b89ad48536bc247d9611d374f733611cb8eaf13 (patch) | |
tree | 14c8c8638499da31c33841c62744c0d229ac43cf /src/com/android/launcher2 | |
parent | d80dc80dbf15f0329a085b21e6e6e4c993e68505 (diff) | |
parent | 7725c79a80f0962c7e1cb38a3405d0676d184ee1 (diff) | |
download | android_packages_apps_Trebuchet-1b89ad48536bc247d9611d374f733611cb8eaf13.tar.gz android_packages_apps_Trebuchet-1b89ad48536bc247d9611d374f733611cb8eaf13.tar.bz2 android_packages_apps_Trebuchet-1b89ad48536bc247d9611d374f733611cb8eaf13.zip |
Merge "DO NOT MERGE Fix bug where folder was almost transparent" into jb-mr2-dev
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/Folder.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 8 |
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 7437eacff..7f90c81b1 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/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(); } |