From a5bbb8987b98fdbef45549103f70979f4e1e9e4d Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Mon, 11 Jun 2012 16:26:14 -0700 Subject: [PATCH] Merge errors. Change-Id: I33d0b1aa5dc5018cc879d2e9878e4825adaa4074 --- .../java/com/android/server/wm/WindowAnimator.java | 10 +--------- .../com/android/server/wm/WindowStateAnimator.java | 5 ++++- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index b5cf20135bc38..efed0a4a3721b 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -496,15 +496,7 @@ public class WindowAnimator { final int N = mWinAnimators.size(); for (int i = 0; i < N; i++) { - final WindowStateAnimator winAnimator = mWinAnimators.get(i); - if (winAnimator.mWin.mIsWallpaper && mService.mWallpaperTarget == null) { - if (!winAnimator.mWin.mWallpaperVisible && !winAnimator.mLastHidden) { - // Wallpaper is no longer visible and there is no wp target => hide it. - winAnimator.hide(); - } - continue; - } - winAnimator.prepareSurfaceLocked(true); + mWinAnimators.get(i).prepareSurfaceLocked(true); } if (mDimParams != null) { diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java index d140aca9204a0..bdacb6e23dacd 100644 --- a/services/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/java/com/android/server/wm/WindowStateAnimator.java @@ -1063,7 +1063,10 @@ class WindowStateAnimator { setSurfaceBoundaries(recoveringMemory); - if (w.mAttachedHidden || !w.isReadyForDisplay()) { + if (mWin.mIsWallpaper && !mWin.mWallpaperVisible) { + // Wallpaper is no longer visible and there is no wp target => hide it. + hide(); + } else if (w.mAttachedHidden || !w.isReadyForDisplay()) { hide(); mAnimator.hideWallpapersLocked(w);