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

Commit 6f69c155 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear pair in recents if exit by other components" into udc-qpr-dev am: 53814f8d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24159024



Change-Id: I5210a11230e982831b9b4d9a0118b07d6672ef69
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bad09bb2 53814f8d

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+2 −1
Original line number Diff line number Diff line
@@ -592,7 +592,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
                SplitScreenController split = mSplitScreenOptional.get();

                if (split.isTaskInSplitScreen(mTaskInfo.lastParentTaskIdBeforePip)) {

                    split.prepareExitSplitScreen(wct, split.getStageOfTask(

                            mTaskInfo.lastParentTaskIdBeforePip));

                            mTaskInfo.lastParentTaskIdBeforePip),

                            SplitScreenController.EXIT_REASON_APP_FINISHED);

                }

            }

            mPipTransitionController.startExitTransition(TRANSIT_EXIT_PIP, wct, destinationBounds);

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+2 −1
Original line number Diff line number Diff line
@@ -423,8 +423,9 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
     * transition.

     */

    public void prepareExitSplitScreen(WindowContainerTransaction wct,

            @StageType int stageToTop) {

            @StageType int stageToTop, @ExitReason int reason) {

        mStageCoordinator.prepareExitSplitScreen(stageToTop, wct);

        mStageCoordinator.clearSplitPairedInRecents(reason);

    }



    public void enterSplitScreen(int taskId, boolean leftOrTop) {

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+1 −1
Original line number Diff line number Diff line
@@ -1494,7 +1494,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        }

    }



    private void clearSplitPairedInRecents(@ExitReason int exitReason) {

    void clearSplitPairedInRecents(@ExitReason int exitReason) {

        if (!shouldBreakPairedTaskInRecents(exitReason) || !mShouldUpdateRecents) return;



        mRecentTasks.ifPresent(recentTasks -> {