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

Commit c056c766 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Do not dismiss split while exit PiP to full-screen 

The dismiss-split-on-exit-pip code path was added back in ag/23447537.
Deprecate this path since no regressions' found.

Flag: EXEMPT bugfix
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/encWvtoZUnUWtxd9MIlltz
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/gE1jnO3OMTJw04Axi08Ou5
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/hlqwTIhGKiJcr0e4oTeL0M
Bug: 358041194
Test: Enter PiP from split-screen from multiple apps
Test: Create split-screen from apps in PiP mode
Change-Id: Ie98bd68d0b52f8280c36c28f78b5216f93eef710
parent 805eff4e

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

+0 −10
Original line number Diff line number Diff line
@@ -693,16 +693,6 @@ 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;

        }