diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-12-06 19:45:06 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-12-06 19:54:37 -0800 |
| commit | c00f0b996712243e0745ea1af870b0229ca11a73 (patch) | |
| tree | a7c2227b2af7abb16a02ce623f72102e963933d0 /src | |
| parent | 65604f1668304ee7718459990206bd1783014771 (diff) | |
| download | android_packages_apps_Trebuchet-c00f0b996712243e0745ea1af870b0229ca11a73.tar.gz android_packages_apps_Trebuchet-c00f0b996712243e0745ea1af870b0229ca11a73.tar.bz2 android_packages_apps_Trebuchet-c00f0b996712243e0745ea1af870b0229ca11a73.zip | |
No longer using fastInvalidate() pattern for half of AllApps transition
Turns out this was likely causing the hardware layer to be redrawn and hence
an anti-optimization
Change-Id: Ib98beebec6efed339eb9f918c24579af529e028e
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 864fca5be..a9d794da8 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2221,21 +2221,19 @@ public final class Launcher extends Activity scaleAnim.setInterpolator(new Workspace.ZoomOutInterpolator()); scaleAnim.addUpdateListener(new LauncherAnimatorUpdateListener() { public void onAnimationUpdate(float a, float b) { - ((View) toView.getParent()).invalidate(); - toView.fastInvalidate(); - toView.setFastScaleX(a * scale + b * 1f); - toView.setFastScaleY(a * scale + b * 1f); + toView.setScaleX(a * scale + b * 1f); + toView.setScaleY(a * scale + b * 1f); } }); toView.setVisibility(View.VISIBLE); - toView.setFastAlpha(0f); + toView.setAlpha(0f); ValueAnimator alphaAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(fadeDuration); alphaAnim.setInterpolator(new DecelerateInterpolator(1.5f)); alphaAnim.addUpdateListener(new LauncherAnimatorUpdateListener() { public void onAnimationUpdate(float a, float b) { // don't need to invalidate because we do so above - toView.setFastAlpha(a * 0f + b * 1f); + toView.setAlpha(a * 0f + b * 1f); } }); alphaAnim.setStartDelay(startDelay); @@ -2346,9 +2344,8 @@ public final class Launcher extends Activity scaleAnim.setInterpolator(new Workspace.ZoomInInterpolator()); scaleAnim.addUpdateListener(new LauncherAnimatorUpdateListener() { public void onAnimationUpdate(float a, float b) { - ((View)fromView.getParent()).fastInvalidate(); - fromView.setFastScaleX(a * oldScaleX + b * scaleFactor); - fromView.setFastScaleY(a * oldScaleY + b * scaleFactor); + fromView.setScaleX(a * oldScaleX + b * scaleFactor); + fromView.setScaleY(a * oldScaleY + b * scaleFactor); } }); final ValueAnimator alphaAnim = ValueAnimator.ofFloat(0f, 1f); @@ -2356,8 +2353,7 @@ public final class Launcher extends Activity alphaAnim.setInterpolator(new AccelerateDecelerateInterpolator()); alphaAnim.addUpdateListener(new LauncherAnimatorUpdateListener() { public void onAnimationUpdate(float a, float b) { - // don't need to invalidate because we do so above - fromView.setFastAlpha(a * 1f + b * 0f); + fromView.setAlpha(a * 1f + b * 0f); } }); if (fromView instanceof LauncherTransitionable) { |