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

am 73220fa0: Merge "Merge errors." into jb-dev

Browse Source 
* commit '73220fa083f6b2b302434ad081dd062505744ed8':
  Merge errors.
This commit is contained in:
Craig Mautner
2012-06-12 12:43:26 -07:00
committed by Android Git Automerger
parent 007f2b40f9 73220fa083
commit d5759f1c2c
2 changed files with 5 additions and 10 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,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) {

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

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