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

Commit 971c7dea authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Remove the validation check when enter split" into tm-qpr-dev am: 5a54deb0 

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



Change-Id: Ifb76e7a0c34ddf54858facd76467ab76dbc4faac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20dbe919 5a54deb0

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

+7 −15
Original line number Diff line number Diff line
@@ -1374,14 +1374,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                }

            }

        } else if (isSideStage && hasChildren && !mMainStage.isActive()) {

            if (mFocusingTaskInfo != null && !isValidToEnterSplitScreen(mFocusingTaskInfo)) {

                final WindowContainerTransaction wct = new WindowContainerTransaction();

                mSideStage.removeAllTasks(wct, true);

                wct.reorder(mRootTaskInfo.token, false /* onTop */);

                mTaskOrganizer.applyTransaction(wct);

                Slog.i(TAG, "cancel entering split screen, reason = "

                        + exitReasonToString(EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW));

            } else {

            // TODO (b/238697912) : Add the validation to prevent entering non-recovered status

            final WindowContainerTransaction wct = new WindowContainerTransaction();

            mSplitLayout.init();

            prepareEnterSplitScreen(wct);
@@ -1389,7 +1382,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            mSyncQueue.runInSync(t ->

                    updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */));

        }

        }

        if (mMainStageListener.mHasChildren && mSideStageListener.mHasChildren) {

            mShouldUpdateRecents = true;

            updateRecentTasksSplitPair();