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

Commit 73d57d9f authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Support exit to full screen to non-split app" into tm-dev am: af014f9e am: aee622bc 

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



Change-Id: I8d74a3721f749bfd75267de6ecbcc6f726f96ca1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86214d75 aee622bc

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

+6 −3
Original line number Diff line number Diff line
@@ -1786,15 +1786,18 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        @Override

        public void onNoLongerSupportMultiWindow() {

            if (mMainStage.isActive()) {

                final boolean isMainStage = mMainStageListener == this;

                if (!ENABLE_SHELL_TRANSITIONS) {

                    StageCoordinator.this.exitSplitScreen(null /* childrenToTop */,

                    StageCoordinator.this.exitSplitScreen(isMainStage ? mMainStage : mSideStage,

                            EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW);

                    return;

                }



                final int stageType = isMainStage ? STAGE_TYPE_MAIN : STAGE_TYPE_SIDE;

                final WindowContainerTransaction wct = new WindowContainerTransaction();

                prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, wct);

                prepareExitSplitScreen(stageType, wct);

                mSplitTransitions.startDismissTransition(null /* transition */, wct,

                        StageCoordinator.this, STAGE_TYPE_UNDEFINED,

                        StageCoordinator.this, stageType,

                        EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW);

            }

        }