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

Commit 67ee7479 authored by Tony Huang's avatar Tony Huang
Browse files

Only bring side to top when split visible 

We did some error handle on startAnimation to exit split by some
exception case. However, we should only bring side to top when
exit only when split is visible case. If split is background,
we should always do not bring side to top.

Fix: 287002454
Test: manual
Test: pass existing tests
Change-Id: Id8835408ffa1bc0e8736659956e20e819a53627a
parent f80ef935

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

+3 −2
Original line number Diff line number Diff line
@@ -2488,8 +2488,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                        && getStageType(dismissStages.valueAt(0)) == STAGE_TYPE_MAIN)

                        || mMainStage.getChildCount() == 0 ? STAGE_TYPE_SIDE : STAGE_TYPE_MAIN;

                // If there is a fullscreen opening change, we should not bring stage to top.

                prepareExitSplitScreen(record.mContainShowFullscreenChange

                        ? STAGE_TYPE_UNDEFINED : dismissTop, wct);

                prepareExitSplitScreen(

                        !record.mContainShowFullscreenChange && isSplitScreenVisible()

                        ? dismissTop : STAGE_TYPE_UNDEFINED, wct);

                mSplitTransitions.startDismissTransition(wct, this, dismissTop,

                        EXIT_REASON_APP_FINISHED);

                // This can happen in some pathological cases. For example: