Merge "Eliminate wallpaper exposure during transition." into jb-dev

Author: Craig Mautner

services/java/com/android/server/wm/WindowAnimator.java

@@ -489,7 +489,11 @@ synchronized void animate() {
 
             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) {
+                    continue;
+                }
+                winAnimator.prepareSurfaceLocked(true);
             }
 
             if (mDimParams != null) {

services/java/com/android/server/wm/WindowManagerService.java

@@ -8553,7 +8553,7 @@ private final void performLayoutAndPlaceSurfacesLockedInner(
                     handleNotObscuredLocked(w, currentTime, innerDw, innerDh);
                 }
 
-                if (obscuredChanged && mWallpaperTarget == w) {
+                if (obscuredChanged && (mWallpaperTarget == w) && w.isVisibleLw()) {
                     // This is the wallpaper target and its obscured state
                     // changed... make sure the current wallaper's visibility
                     // has been updated accordingly.

services/java/com/android/server/wm/WindowStateAnimator.java

@@ -381,6 +381,7 @@ void finishExit() {
         }
         if (mService.mWallpaperTarget == mWin && mService.mLowerWallpaperTarget == null) {
             mAnimator.hideWallpapersLocked();
+            mAnimator.mPendingLayoutChanges |= WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;
         }
     }
 
@@ -1105,8 +1106,8 @@ public void prepareSurfaceLocked(final boolean recoveringMemory) {
                 try {
                     mSurfaceAlpha = mShownAlpha;
                     mSurface.setAlpha(mShownAlpha);
-                    mSurfaceLayer = w.mWinAnimator.mAnimLayer;
-                    mSurface.setLayer(w.mWinAnimator.mAnimLayer);
+                    mSurfaceLayer = mAnimLayer;
+                    mSurface.setLayer(mAnimLayer);
                     mSurface.setMatrix(
                         mDsDx*w.mHScale, mDtDx*w.mVScale,
                         mDsDy*w.mHScale, mDtDy*w.mVScale);