From bb7abee972da8c19c54c76cc0182af45661919bb Mon Sep 17 00:00:00 2001
From: Jerry Chang <chenghsiuchang@google.com>
Date: Thu, 7 Oct 2021 19:37:51 +0800
Subject: [PATCH] Fix layout been truncated after activated split screen

Stop cropping root surfaces when dismissing split screen, so the next
time entering split screen won't apply remaining crop setup
unexpectedly.

Fix: 202368189
Fix: 202358094
Test: atest WMShellUnitTests
Change-Id: Idf079b6cb04f1ced1d7cdf166fe54309dd64f163
---
 .../src/com/android/wm/shell/splitscreen/StageCoordinator.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
index d7a6cfff6c6fb..c1f1ca16fe37e 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -515,6 +515,9 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
         mSideStage.removeAllTasks(wct, childrenToTop == mSideStage);
         mMainStage.deactivate(wct, childrenToTop == mMainStage);
         mTaskOrganizer.applyTransaction(wct);
+        mSyncQueue.runInSync(t -> t
+                .setWindowCrop(mMainStage.mRootLeash, null)
+                .setWindowCrop(mSideStage.mRootLeash, null));
         // Hide divider and reset its position.
         setDividerVisibility(false);
         mSplitLayout.resetDividerPosition();