commit e32c30784191a9244a08450759471c934c85034c
author Craig Mautner <cmautner@google.com> Mon Mar 12 15:25:35 2012 -0700
committer Craig Mautner <cmautner@google.com> Wed Mar 14 16:09:28 2012 -0700
tree e591237d719f095d48b05239831c3120e690f116
parent a1b09a92d8879f1f385046533628547a118eb558

Separate out animations from layout.

(Dianne) pulled the animation steps out of the layout. Changes to
exposed layers cause repeated calls to layout code.

Combined animation steps into start and finish animation code.

Change-Id: I3602d1d6249d20987d102a54e3a67a7a39361b55

services/java/com/android/server/wm/ScreenRotationAnimation.java

diff --git a/services/java/com/android/server/wm/ScreenRotationAnimation.java b/services/java/com/android/server/wm/ScreenRotationAnimation.java
index 7b5bf08..58187b6 100644
--- a/services/java/com/android/server/wm/ScreenRotationAnimation.java
+++ b/services/java/com/android/server/wm/ScreenRotationAnimation.java
@@ -29,7 +29,7 @@
 import android.view.animation.AnimationUtils;
 import android.view.animation.Transformation;
 
-class ScreenRotationAnimation implements WindowManagerService.StepAnimator {
+class ScreenRotationAnimation {
     static final String TAG = "ScreenRotationAnimation";
     static final boolean DEBUG_STATE = false;
     static final boolean DEBUG_TRANSFORMS = false;
@@ -540,8 +540,7 @@
                 || mRotateFrameAnimation != null;
     }
 
-    @Override
-    public boolean stepAnimation(long now) {
+    private boolean stepAnimation(long now) {
 
         if (mFinishAnimReady && mFinishAnimStartTime < 0) {
             if (DEBUG_STATE) Slog.v(TAG, "Step: finish anim now ready");
@@ -725,7 +724,7 @@
         setSnapshotTransform(mSnapshotFinalMatrix, mExitTransformation.getAlpha());
     }
     
-    public boolean startAndFinishAnimationLocked(long now) {
+    public boolean stepAnimationLocked(long now) {
         if (!isAnimating()) {
             if (DEBUG_STATE) Slog.v(TAG, "Step: no animations running");
             mFinishAnimReady = false;
@@ -763,8 +762,8 @@
             }
             mAnimRunning = true;
         }
-        
-        return true;
+
+        return stepAnimation(now);
     }
 
     public Transformation getEnterTransformation() {