Step 1 in consolidating wallpaper animation.
- Merge testWallpaperAndBackgroundLocked into
updateWindowsAndWallpaperLocked. Eliminates mDetachedWallpaper,
mWindowAnimationBackground, and mWindowAnimationBackgroundColor.
- Merge multiple calls to perform layout into one.
- Cleaned up debug output.
Change-Id: I5dc2d8330dc092ee2b165867cddb7d16b431fa0b
diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java
index 109161a..9821649 100644
--- a/services/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/java/com/android/server/wm/WindowStateAnimator.java
@@ -203,7 +203,7 @@
}
mTransformation.clear();
final boolean more = mAnimation.getTransformation(currentTime, mTransformation);
- if (DEBUG_ANIM) Slog.v(
+ if (false && DEBUG_ANIM) Slog.v(
TAG, "Stepped animation in " + this +
": more=" + more + ", xform=" + mTransformation);
return more;
@@ -896,7 +896,7 @@
//Slog.i(TAG, "Not applying alpha transform");
}
- if (WindowManagerService.localLOGV && (mShownAlpha == 1.0 || mShownAlpha == 0.0)) Slog.v(
+ if ((DEBUG_SURFACE_TRACE || WindowManagerService.localLOGV) && (mShownAlpha == 1.0 || mShownAlpha == 0.0)) Slog.v(
TAG, "computeShownFrameLocked: Animating " + this +
" mAlpha=" + mAlpha +
" self=" + (selfTransformation ? mTransformation.getAlpha() : "null") +
@@ -1144,8 +1144,8 @@
}
}
} else {
- if (DEBUG_ANIM) {
- // Slog.v(TAG, "prepareSurface: No changes in animation for " + mWin);
+ if (DEBUG_ANIM && isAnimating()) {
+ Slog.v(TAG, "prepareSurface: No changes in animation for " + this);
}
displayed = true;
}