diff options
| author | Craig Mautner <cmautner@google.com> | 2012-06-11 17:11:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-11 17:11:47 -0700 |
| commit | 16a61a51ffdf0490d3fd201c8679a990723f7d8e (patch) | |
| tree | f15d4be73138ad1bcedec4cf1bef53198bb6154d /services/java/com/android/server/wm/WindowStateAnimator.java | |
| parent | 73220fa083f6b2b302434ad081dd062505744ed8 (diff) | |
| parent | c38869abe5d89b7f9e66f23599889e17b93b5eec (diff) | |
| download | frameworks_base-16a61a51ffdf0490d3fd201c8679a990723f7d8e.zip frameworks_base-16a61a51ffdf0490d3fd201c8679a990723f7d8e.tar.gz frameworks_base-16a61a51ffdf0490d3fd201c8679a990723f7d8e.tar.bz2 | |
Merge "Revert "Merge errors."" into jb-dev
Diffstat (limited to 'services/java/com/android/server/wm/WindowStateAnimator.java')
| -rw-r--r-- | services/java/com/android/server/wm/WindowStateAnimator.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java index bdacb6e..d140aca 100644 --- a/services/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/java/com/android/server/wm/WindowStateAnimator.java @@ -1063,10 +1063,7 @@ class WindowStateAnimator { setSurfaceBoundaries(recoveringMemory); - 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()) { + if (w.mAttachedHidden || !w.isReadyForDisplay()) { hide(); mAnimator.hideWallpapersLocked(w); |