diff options
| author | 2023-06-09 06:10:35 +0000 | |
|---|---|---|
| committer | 2023-06-09 06:10:35 +0000 | |
| commit | 67fc9efd2078b7a27be7127e8d64d020e39f08b5 (patch) | |
| tree | 4f778b25e55dd1c812cc35f93d4eb9d06ed9b240 | |
| parent | a744d7ac2ae4b9d25c168522961a515e826f3c9d (diff) | |
| parent | f05be86916e42b318d0c1e0cf56a3306e750d9df (diff) | |
Merge "Update the visibility of split to invisible" into udc-dev am: f05be86916
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23560418
Change-Id: I2d8e81ed5b0b3413fd017a35faa17e232bfccf32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 c8e88fcc0a6a..a1f82aded3c7 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 @@ -2884,6 +2884,12 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, /** Call this when the recents animation canceled during split-screen. */ public void onRecentsInSplitAnimationCanceled() { mPausingTasks.clear(); + setSplitsVisible(false); + + final WindowContainerTransaction wct = new WindowContainerTransaction(); + wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, + true /* reparentLeafTaskIfRelaunch */); + mTaskOrganizer.applyTransaction(wct); } /** Call this when the recents animation during split-screen finishes. */ @@ -2910,7 +2916,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, setSplitsVisible(false); finishWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, true /* reparentLeafTaskIfRelaunch */); - logExit(EXIT_REASON_UNKNOWN); } /** Call this when the recents animation finishes by doing pair-to-pair switch. */ |