am 78fc35bd: Merge "Hide wallpaper when wallpaper target gets hidden." into jb-dev

* commit '78fc35bde452c2fea18ecf9d8aeedee6d82ba1eb':
  Hide wallpaper when wallpaper target gets hidden.
This commit is contained in:
Craig Mautner
2012-06-08 13:18:13 -07:00
committed by Android Git Automerger

View File

@@ -1067,6 +1067,11 @@ class WindowStateAnimator {
if (w.mAttachedHidden || !w.isReadyForDisplay()) { if (w.mAttachedHidden || !w.isReadyForDisplay()) {
hide(); 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 // If we are waiting for this window to handle an
// orientation change, well, it is hidden, so // orientation change, well, it is hidden, so
// doesn't really matter. Note that this does // doesn't really matter. Note that this does