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

* commit '90192a6165f37207fa8ceb15c07aa9582327c294':
  Make SurfaceView layers captured by screenshotApplications()
This commit is contained in:
Craig Mautner
2013-11-21 18:43:43 -08:00
committed by Android Git Automerger

View File

@@ -5595,8 +5595,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) {
@@ -5622,11 +5621,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) {