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

Commit 99933f97 authored Jul 27, 2022 by Tony Huang Committed by Android (Google) Code Review Jul 27, 2022

Merge "Fix wrong split layout after drag drop" into tm-qpr-dev

parents 89487c8a 55f0c287

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -398,8 +398,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		return;
		}

		mStageCoordinator.updateSurfaceBounds(null /* layout */, t,
		false /* applyResizingOffset */);
		for (int i = 0; i < apps.length; ++i) {
		if (apps[i].mode == MODE_OPENING) {
		t.show(apps[i].leash);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1283,7 +1283,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		private void onStageHasChildrenChanged(StageListenerImpl stageListener) {
		final boolean hasChildren = stageListener.mHasChildren;
		final boolean isSideStage = stageListener == mSideStageListener;
		if (!hasChildren && !mIsExiting) {
		if (!hasChildren && !mIsExiting && mMainStage.isActive()) {
		if (isSideStage && mMainStageListener.mVisible) {
		// Exit to main stage if side stage no longer has children.
		if (ENABLE_SHELL_TRANSITIONS) {
		@@ -1303,7 +1303,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		EXIT_REASON_APP_FINISHED);
		}
		}
		} else if (isSideStage && !mMainStage.isActive()) {
		} else if (isSideStage && hasChildren && !mMainStage.isActive()) {
		if (mFocusingTaskInfo != null && !isValidToEnterSplitScreen(mFocusingTaskInfo)) {
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		mSideStage.removeAllTasks(wct, true);