Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Merge errors."" into jb-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-06-11 17:11:47 -07:00
committed by Android (Google) Code Review
parent 73220fa083 c38869abe5
commit 16a61a51ff
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/wm/WindowAnimator.java
View File

@@ -496,7 +496,15 @@ public class WindowAnimator {
final int N = mWinAnimators.size();
for (int i = 0; i < N; i++) {
mWinAnimators.get(i).prepareSurfaceLocked(true);
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);
}
if (mDimParams != null) {

5
services/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -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);