From 056ea32d662545705d8554a56a7261eebc58d4cd Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Fri, 7 Feb 2025 15:56:13 -0500 Subject: Prevent dismissing split when pausing tasks trampolines to new activity * This was originally done in ag/23352436 for the case of swiping up split to home and imemidately opening up one of the split tasks in fullscreen. Removing this code doesn't cause that to repro anymore * This is a partial fix, more to be done with b/395146421 Test: Bug doesn't repro, old bug doesn't repro for which this code was added Fix: 339769621 Flag: EXEMPT bugfix Change-Id: I0d7f8a7070bcd7ed3ecf5350299f1914e7799247 --- .../src/com/android/wm/shell/splitscreen/StageCoordinator.java | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libs') 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 13940b1da257..32f701f355b3 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 @@ -2845,14 +2845,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, prepareExitSplitScreen(dismissTop, out, EXIT_REASON_APP_FINISHED); mSplitTransitions.setDismissTransition(transition, dismissTop, EXIT_REASON_APP_FINISHED); - } else if (isOpening && !mPausingTasks.isEmpty()) { - // One of the splitting task is opening while animating the split pair in - // recents, which means to dismiss the split pair to this task. - int dismissTop = getStageType(stage) == STAGE_TYPE_MAIN - ? STAGE_TYPE_MAIN : STAGE_TYPE_SIDE; - prepareExitSplitScreen(dismissTop, out, EXIT_REASON_APP_FINISHED); - mSplitTransitions.setDismissTransition(transition, dismissTop, - EXIT_REASON_APP_FINISHED); } else if (!isSplitScreenVisible() && isOpening) { // If split is running in the background and the trigger task is appearing into // split, prepare to enter split screen. -- cgit v1.2.3-59-g8ed1b