diff options
author | Michael Jurka <mikejurka@google.com> | 2013-05-03 11:40:51 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-05-03 15:52:29 +0200 |
commit | 7725c79a80f0962c7e1cb38a3405d0676d184ee1 (patch) | |
tree | 48a14174fa38d509943c277862f6de750d65f705 /src/com/android | |
parent | 81426b9bfee67c1313f59629e9dca523fe2c46d1 (diff) | |
download | android_packages_apps_Trebuchet-7725c79a80f0962c7e1cb38a3405d0676d184ee1.tar.gz android_packages_apps_Trebuchet-7725c79a80f0962c7e1cb38a3405d0676d184ee1.tar.bz2 android_packages_apps_Trebuchet-7725c79a80f0962c7e1cb38a3405d0676d184ee1.zip |
DO NOT MERGE Fix bug where folder was almost transparent
Bug: 8775089
Diffstat (limited to 'src/com/android')
-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 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(); } |