From ff92f04e76cb141caba6bf767618b1c5153242c1 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Fri, 8 Jun 2012 12:56:14 -0700 Subject: [PATCH] Hide wallpaper when wallpaper target gets hidden. Another location that potentially hides the wallpaper target while leaving the wallpaper itself still visible. Causes the wallpaper to show up when upper surfaces are transparent all the way down. Fixes bug b6621986. Change-Id: If75053160f041eb78868eda36b7820fb2110d069 --- services/java/com/android/server/wm/WindowStateAnimator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java index 485f4a773c7a8..5908958d6c004 100644 --- a/services/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/java/com/android/server/wm/WindowStateAnimator.java @@ -1067,6 +1067,11 @@ class WindowStateAnimator { if (w.mAttachedHidden || !w.isReadyForDisplay()) { hide(); + // TODO: Consider moving the following into hide() and out of finishExit() as well. + if (mService.mWallpaperTarget == mWin && mService.mLowerWallpaperTarget == null) { + mAnimator.hideWallpapersLocked(); + mAnimator.mPendingLayoutChanges |= WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; + } // If we are waiting for this window to handle an // orientation change, well, it is hidden, so // doesn't really matter. Note that this does