commit fbf378c736a973b8edaf1fc4c187d11dc0f5e291
author Craig Mautner <cmautner@google.com> Mon Apr 23 17:24:21 2012 -0700
committer Craig Mautner <cmautner@google.com> Tue Apr 24 09:56:59 2012 -0700
tree 6ddc12b81b75725761d370e319048bb9f3301559
parent 1579a67ee9a53740a09e606e071fd571ee627449

Various debugging enhancements.

Also moved DummyAnimation into AppWindowAnimator where it belongs.

Change-Id: I7da254a8b99030b898e2ff8d983500d7ce0b2b65

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

diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java
index f946f6c..e7ad1ff 100644
--- a/services/java/com/android/server/wm/WindowAnimator.java
+++ b/services/java/com/android/server/wm/WindowAnimator.java
@@ -130,7 +130,7 @@
         for (i=0; i<NAT; i++) {
             final AppWindowAnimator appAnimator = mService.mAppTokens.get(i).mAppAnimator;
             final boolean wasAnimating = appAnimator.animation != null
-                    && appAnimator.animation != WindowManagerService.sDummyAnimation;
+                    && appAnimator.animation != AppWindowAnimator.sDummyAnimation;
             if (appAnimator.stepAnimationLocked(mCurrentTime, mInnerDw, mInnerDh)) {
                 mAnimating = true;
             } else if (wasAnimating) {
@@ -147,7 +147,7 @@
         for (i=0; i<NEAT; i++) {
             final AppWindowAnimator appAnimator = mService.mExitingAppTokens.get(i).mAppAnimator;
             final boolean wasAnimating = appAnimator.animation != null
-                    && appAnimator.animation != WindowManagerService.sDummyAnimation;
+                    && appAnimator.animation != AppWindowAnimator.sDummyAnimation;
             if (appAnimator.stepAnimationLocked(mCurrentTime, mInnerDw, mInnerDh)) {
                 mAnimating = true;
             } else if (wasAnimating) {