PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b4848296: am c00f0b99: No longer using fastInvalidate() pattern for half of AllApps transition

Browse Source 
* commit 'b4848296880a351b40b1f01a0bb675e7e9c6ee52':
  No longer using fastInvalidate() pattern for half of AllApps transition
This commit is contained in:
Adam Cohen
2011-12-06 23:11:55 -08:00
committed by Android Git Automerger
parent afae108e09 b484829688
commit 90f53da680
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Launcher.java
+7 -11
View File
@@ -2225,21 +2225,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);
@@ -2350,9 +2348,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);
@@ -2360,8 +2357,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) {