diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-06-08 14:46:22 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-06-08 14:46:22 -0700 |
| commit | 8ec2303379eb467e063113385c9514063abed787 (patch) | |
| tree | 4edfa29da93cd71ae10111c39778fd203d54fb76 /src/com | |
| parent | ec3f3b92f0d3e545f1921b6111a34541000f416c (diff) | |
| download | android_packages_apps_Trebuchet-8ec2303379eb467e063113385c9514063abed787.tar.gz android_packages_apps_Trebuchet-8ec2303379eb467e063113385c9514063abed787.tar.bz2 android_packages_apps_Trebuchet-8ec2303379eb467e063113385c9514063abed787.zip | |
Fix subtle folder jank related to previous change
Change-Id: I1872201eb80ad927bbdc9b95578c599a17696deb
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 7da5b56c8..63af10a01 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2062,24 +2062,29 @@ public final class Launcher extends Activity lp.customPosition = true; lp.x = mRectForFolderAnimation.left; lp.y = mRectForFolderAnimation.top; + lp.width = width; + lp.height = height; mFolderIconCanvas.drawColor(0, PorterDuff.Mode.CLEAR); fi.draw(mFolderIconCanvas); mFolderIconImageView.setImageBitmap(mFolderIconBitmap); - mFolderIconImageView.setPivotX(fi.mFolder.getPivotXForIconAnimation()); - mFolderIconImageView.setPivotY(fi.mFolder.getPivotYForIconAnimation()); - + if (fi.mFolder != null) { + mFolderIconImageView.setPivotX(fi.mFolder.getPivotXForIconAnimation()); + mFolderIconImageView.setPivotY(fi.mFolder.getPivotYForIconAnimation()); + } // Just in case this image view is still in the drag layer from a previous animation, // we remove it and re-add it. if (mDragLayer.indexOfChild(mFolderIconImageView) != -1) { mDragLayer.removeView(mFolderIconImageView); } mDragLayer.addView(mFolderIconImageView, lp); + if (fi.mFolder != null) { + fi.mFolder.bringToFront(); + } } private void growAndFadeOutFolderIcon(FolderIcon fi) { if (fi == null) return; - PropertyValuesHolder alpha = PropertyValuesHolder.ofFloat("alpha", 0); PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat("scaleX", 1.5f); PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat("scaleY", 1.5f); @@ -2103,7 +2108,6 @@ public final class Launcher extends Activity private void shrinkAndFadeInFolderIcon(final FolderIcon fi) { if (fi == null) return; - PropertyValuesHolder alpha = PropertyValuesHolder.ofFloat("alpha", 1.0f); PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat("scaleX", 1.0f); PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat("scaleY", 1.0f); @@ -2113,7 +2117,6 @@ public final class Launcher extends Activity // We remove and re-draw the FolderIcon in-case it has changed mDragLayer.removeView(mFolderIconImageView); copyFolderIconToImage(fi); - ObjectAnimator oa = ObjectAnimator.ofPropertyValuesHolder(mFolderIconImageView, alpha, scaleX, scaleY); oa.setDuration(getResources().getInteger(R.integer.config_folderAnimDuration)); |