am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"

* commit '0495f4eded46efd7035ed672dc933ec6430b93fd':
  Make SurfaceView layers captured by screenshotApplications()
This commit is contained in:
Craig Mautner
2013-11-21 08:50:05 -08:00
committed by Android Git Automerger

View File

@@ -5383,8 +5383,7 @@ public class WindowManagerService extends IWindowManager.Stub
// We keep on including windows until we go past a full-screen
// window.
boolean fullscreen = ws.isFullscreen(dw, dh);
including = !ws.mIsImWindow && !fullscreen;
including = !ws.mIsImWindow && !ws.isFullscreen(dw, dh);
final WindowStateAnimator winAnim = ws.mWinAnimator;
if (maxLayer < winAnim.mSurfaceLayer) {
@@ -5409,11 +5408,6 @@ public class WindowManagerService extends IWindowManager.Stub
ws.isDisplayedLw()) {
screenshotReady = true;
}
if (fullscreen) {
// No point in continuing down through windows.
break;
}
}
if (appToken != null && appWin == null) {