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

Commit 8b43c577 authored Jul 27, 2022 by Tony Huang Committed by Automerger Merge Worker Jul 27, 2022

Merge "Fix wrong split layout after drag drop" into tm-qpr-dev am: 99933f97 am: 55b28daa

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

Change-Id: Ib96acf4a4996b629613bd4f652d4085588b2028e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents bc2135bc 55b28daa

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