Merge "Don't update crop WSA when drag resizing so screenshots are correct." into pi-dev
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index aaf59b9..bba7772 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -4314,7 +4314,11 @@
// 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,