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

Commit a0840413 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Revert "Do not dismiss split while exit PiP to full-screen" 

This reverts commit c056c766.

Reason for revert: b/360253138

Change-Id: I34427aac21e5dde6e41f4dc7d1c53460c59ada7a
parent c056c766

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

+10 −0
Original line number Diff line number Diff line
@@ -693,6 +693,16 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
                return;

            }



            if (mSplitScreenOptional.isPresent()) {

                // If pip activity will reparent to origin task case and if the origin task still

                // under split root, apply exit split transaction to make it expand to fullscreen.

                SplitScreenController split = mSplitScreenOptional.get();

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

                    split.prepareExitSplitScreen(wct, split.getStageOfTask(

                            mTaskInfo.lastParentTaskIdBeforePip),

                            SplitScreenController.EXIT_REASON_APP_FINISHED);

                }

            }

            mPipTransitionController.startExitTransition(TRANSIT_EXIT_PIP, wct, destinationBounds);

            return;

        }