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

Merge "Make SurfaceView layers captured by screenshotApplications()"

Browse Source
This commit is contained in:
Craig Mautner
2013-11-21 16:45:28 +00:00
committed by Gerrit Code Review
parent 572b759a41 7ccba97417
commit 0495f4eded
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/wm/WindowManagerService.java
View File

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