Merge "Refactor animation out of WindowState."

Author: Craig Mautner

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

@@ -51,7 +51,7 @@ class AppWindowToken extends WindowToken {
     int groupId = -1;
     boolean appFullscreen;
     int requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
-    
+
     // The input dispatching timeout for this application token in nanoseconds.
     long inputDispatchingTimeoutNanos;
 
@@ -225,7 +225,7 @@ boolean showAllWindowsLocked() {
             if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG,
                     "performing show on: " + w);
             w.performShowLocked();
-            isAnimating |= w.isAnimating();
+            isAnimating |= w.mWinAnimator.isAnimating();
         }
         return isAnimating;
     }
@@ -243,11 +243,11 @@ private void stepThumbnailAnimation(long currentTime) {
         // cache often used attributes locally
         final float tmpFloats[] = service.mTmpFloats;
         thumbnailTransformation.getMatrix().getValues(tmpFloats);
-        if (WindowManagerService.SHOW_TRANSACTIONS) service.logSurface(thumbnail,
+        if (WindowManagerService.SHOW_TRANSACTIONS) WindowManagerService.logSurface(thumbnail,
                 "thumbnail", "POS " + tmpFloats[Matrix.MTRANS_X]
                 + ", " + tmpFloats[Matrix.MTRANS_Y], null);
         thumbnail.setPosition(tmpFloats[Matrix.MTRANS_X], tmpFloats[Matrix.MTRANS_Y]);
-        if (WindowManagerService.SHOW_TRANSACTIONS) service.logSurface(thumbnail,
+        if (WindowManagerService.SHOW_TRANSACTIONS) WindowManagerService.logSurface(thumbnail,
                 "thumbnail", "alpha=" + thumbnailTransformation.getAlpha()
                 + " layer=" + thumbnailLayer
                 + " matrix=[" + tmpFloats[Matrix.MSCALE_X]
@@ -358,7 +358,7 @@ boolean stepAnimationLocked(long currentTime, int dw, int dh) {
 
         final int N = windows.size();
         for (int i=0; i<N; i++) {
-            windows.get(i).finishExit();
+            windows.get(i).mWinAnimator.finishExit();
         }
         updateReportedVisibilityLocked();
 
@@ -388,7 +388,7 @@ void updateReportedVisibilityLocked() {
             if (WindowManagerService.DEBUG_VISIBILITY) {
                 Slog.v(WindowManagerService.TAG, "Win " + win + ": isDrawn="
                         + win.isDrawnLw()
-                        + ", isAnimating=" + win.isAnimating());
+                        + ", isAnimating=" + win.mWinAnimator.isAnimating());
                 if (!win.isDrawnLw()) {
                     Slog.v(WindowManagerService.TAG, "Not displayed: s=" + win.mSurface
                             + " pv=" + win.mPolicyVisibility
@@ -398,17 +398,17 @@ void updateReportedVisibilityLocked() {
                             + " th="
                             + (win.mAppToken != null
                                     ? win.mAppToken.hiddenRequested : false)
-                            + " a=" + win.mAnimating);
+                            + " a=" + win.mWinAnimator.mAnimating);
                 }
             }
             numInteresting++;
             if (win.isDrawnLw()) {
                 numDrawn++;
-                if (!win.isAnimating()) {
+                if (!win.mWinAnimator.isAnimating()) {
                     numVisible++;
                 }
                 nowGone = false;
-            } else if (win.isAnimating()) {
+            } else if (win.mWinAnimator.isAnimating()) {
                 nowGone = false;
             }
         }

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

@@ -82,7 +82,7 @@ void show(int dw, int dh) {
 
     /**
      * Set's the dim surface's layer and update dim parameters that will be used in
-     * {@link updateSurface} after all windows are examined.
+     * {@link #updateSurface} after all windows are examined.
      */
     void updateParameters(Resources res, WindowState w, long currentTime) {
         mDimSurface.setLayer(w.mAnimLayer - WindowManagerService.LAYER_OFFSET_DIM);
@@ -94,15 +94,15 @@ void updateParameters(Resources res, WindowState w, long currentTime) {
             // If the desired dim level has changed, then
             // start an animation to it.
             mLastDimAnimTime = currentTime;
-            long duration = (w.mAnimating && w.mAnimation != null)
-                    ? w.mAnimation.computeDurationHint()
+            long duration = (w.mWinAnimator.mAnimating && w.mWinAnimator.mAnimation != null)
+                    ? w.mWinAnimator.mAnimation.computeDurationHint()
                     : WindowManagerService.DEFAULT_DIM_DURATION;
             if (target > mDimTargetAlpha) {
                 TypedValue tv = new TypedValue();
                 res.getValue(com.android.internal.R.fraction.config_dimBehindFadeDuration,
                         tv, true);
                 if (tv.type == TypedValue.TYPE_FRACTION) {
-                    duration = (long)tv.getFraction((float)duration, (float)duration);
+                    duration = (long)tv.getFraction(duration, duration);
                 } else if (tv.type >= TypedValue.TYPE_FIRST_INT
                         && tv.type <= TypedValue.TYPE_LAST_INT) {
                     duration = tv.data;

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

@@ -79,7 +79,7 @@ private void updateWindowsAppsAndRotationAnimationsLocked() {
                 }
             }
         }
-        
+
         final int NEAT = mService.mExitingAppTokens.size();
         for (i=0; i<NEAT; i++) {
             final AppWindowToken appToken = mService.mExitingAppTokens.get(i);
@@ -115,6 +115,7 @@ private void updateWindowsAndWallpaperLocked() {
 
         for (int i = mService.mWindows.size() - 1; i >= 0; i--) {
             WindowState w = mService.mWindows.get(i);
+            WindowStateAnimator winAnimator = w.mWinAnimator;
 
             final WindowManager.LayoutParams attrs = w.mAttrs;
 
@@ -143,16 +144,16 @@ private void updateWindowsAndWallpaperLocked() {
                     // let's do something.
                     Animation a = AnimationUtils.loadAnimation(mContext,
                             com.android.internal.R.anim.window_move_from_decor);
-                    w.setAnimation(a);
+                    winAnimator.setAnimation(a);
                     w.mAnimDw = w.mLastFrame.left - w.mFrame.left;
                     w.mAnimDh = w.mLastFrame.top - w.mFrame.top;
                 } else {
                     w.mAnimDw = mInnerDw;
                     w.mAnimDh = mInnerDh;
                 }
 
-                final boolean wasAnimating = w.mWasAnimating;
-                final boolean nowAnimating = w.stepAnimationLocked(mCurrentTime);
+                final boolean wasAnimating = winAnimator.mWasAnimating;
+                final boolean nowAnimating = winAnimator.stepAnimationLocked(mCurrentTime);
 
                 if (WindowManagerService.DEBUG_WALLPAPER) {
                     Slog.v(TAG, w + ": wasAnimating=" + wasAnimating +
@@ -163,17 +164,17 @@ private void updateWindowsAndWallpaperLocked() {
                 // an animating window and take care of a request to run
                 // a detached wallpaper animation.
                 if (nowAnimating) {
-                    if (w.mAnimation != null) {
+                    if (winAnimator.mAnimation != null) {
                         if ((w.mAttrs.flags&FLAG_SHOW_WALLPAPER) != 0
-                                && w.mAnimation.getDetachWallpaper()) {
+                                && winAnimator.mAnimation.getDetachWallpaper()) {
                             mService.mInnerFields.mDetachedWallpaper = w;
                         }
-                        if (w.mAnimation.getBackgroundColor() != 0) {
+                        if (winAnimator.mAnimation.getBackgroundColor() != 0) {
                             if (mWindowAnimationBackground == null
                                     || (w.mAnimLayer < mWindowAnimationBackground.mAnimLayer)) {
                                 mWindowAnimationBackground = w;
                                 mWindowAnimationBackgroundColor =
-                                        w.mAnimation.getBackgroundColor();
+                                        winAnimator.mAnimation.getBackgroundColor();
                             }
                         }
                     }
@@ -200,7 +201,7 @@ private void updateWindowsAndWallpaperLocked() {
                     }
                 }
 
-                if (wasAnimating && !w.mAnimating && mService.mWallpaperTarget == w) {
+                if (wasAnimating && !winAnimator.mAnimating && mService.mWallpaperTarget == w) {
                     mService.mInnerFields.mWallpaperMayChange = true;
                     mPendingLayoutChanges |= WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
                     if (WindowManagerService.DEBUG_LAYOUT_REPEATS) {
@@ -219,7 +220,7 @@ private void updateWindowsAndWallpaperLocked() {
                             mService.debugLayoutRepeats("updateWindowsAndWallpaperLocked 3");
                         }
                         mService.mFocusMayChange = true;
-                    } else if (w.isReadyForDisplay() && w.mAnimation == null) {
+                    } else if (w.isReadyForDisplay() && winAnimator.mAnimation == null) {
                         mForceHiding = true;
                     }
                 } else if (mPolicy.canBeForceHidden(w, attrs)) {
@@ -241,7 +242,7 @@ private void updateWindowsAndWallpaperLocked() {
                                 // clean up later.
                                 Animation a = mPolicy.createForceHideEnterAnimation();
                                 if (a != null) {
-                                    w.setAnimation(a);
+                                    winAnimator.setAnimation(a);
                                 }
                             }
                             if (mCurrentFocus == null || mCurrentFocus.mLayer < w.mLayer) {
@@ -277,15 +278,15 @@ private void updateWindowsAndWallpaperLocked() {
                             WindowManagerService.DEBUG_ORIENTATION) {
                         Slog.v(TAG, "Eval win " + w + ": isDrawn="
                                 + w.isDrawnLw()
-                                + ", isAnimating=" + w.isAnimating());
+                                + ", isAnimating=" + winAnimator.isAnimating());
                         if (!w.isDrawnLw()) {
                             Slog.v(TAG, "Not displayed: s=" + w.mSurface
                                     + " pv=" + w.mPolicyVisibility
                                     + " dp=" + w.mDrawPending
                                     + " cdp=" + w.mCommitDrawPending
                                     + " ah=" + w.mAttachedHidden
                                     + " th=" + atoken.hiddenRequested
-                                    + " a=" + w.mAnimating);
+                                    + " a=" + winAnimator.mAnimating);
                         }
                     }
                     if (w != atoken.startingWindow) {