diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-05-03 11:40:51 +0200 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2013-08-12 16:51:49 +0200 |
| commit | 2231069888b53e6a88dab8001f33f66ff64824fb (patch) | |
| tree | 4be1a28e93f4fa6b17bf77e845972838f77977eb /src | |
| parent | 0cfc98f7359e0d0be77ff92fd17d8057f58075d1 (diff) | |
| download | android_packages_apps_Trebuchet-2231069888b53e6a88dab8001f33f66ff64824fb.tar.gz android_packages_apps_Trebuchet-2231069888b53e6a88dab8001f33f66ff64824fb.tar.bz2 android_packages_apps_Trebuchet-2231069888b53e6a88dab8001f33f66ff64824fb.zip | |
DO NOT MERGE Fix bug where folder was almost transparent
Bug: 8775089
Change-Id: I55d1bdf687e40017a10561f6bb20fc8920ab123c
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Folder.java | 3 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Launcher.java | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java index b46a3d0e5..75ddefa18 100644 --- a/src/com/cyanogenmod/trebuchet/Folder.java +++ b/src/com/cyanogenmod/trebuchet/Folder.java @@ -486,6 +486,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/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java index 2d58aeda9..78bba2647 100644 --- a/src/com/cyanogenmod/trebuchet/Launcher.java +++ b/src/com/cyanogenmod/trebuchet/Launcher.java @@ -2558,6 +2558,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(); } |