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

Commit 98abdd89 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 am: 971c7dea 

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



Change-Id: I7557966961da3abd7a43db6487f62aa40b9e061b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf488547 971c7dea

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();