Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4c4086b authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Don't update crop WSA when drag resizing so screenshots are correct."... 

Merge "Don't update crop WSA when drag resizing so screenshots are correct." into pi-dev am: 5e09e0a3
am: 4fe3b6d3

Change-Id: I5972804617cf5420cc0134b44ccd42882298a4c9
parents 2d268e4d 4fe3b6d3

services/core/java/com/android/server/wm/WindowState.java

+5 −1
Original line number Diff line number Diff line
@@ -4314,7 +4314,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        // If a freeform window is animating from a position where it would be cutoff, it would be

        // cutoff during the animation. We don't want that, so for the duration of the animation

        // we ignore the decor cropping and depend on layering to position windows correctly.

        final boolean cropToDecor = !(inFreeformWindowingMode() && isAnimatingLw());



        // We also ignore cropping when the window is currently being drag resized in split screen

        // to prevent issues with the crop for screenshot.

        final boolean cropToDecor =

                !(inFreeformWindowingMode() && isAnimatingLw()) && !isDockedResizing();

        if (cropToDecor) {

            // Intersect with the decor rect, offsetted by window position.

            systemDecorRect.intersect(decorRect.left - left, decorRect.top - top,