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

Commit f65459a0 authored Apr 25, 2023 by Treehugger Robot Committed by Automerger Merge Worker Apr 25, 2023

Merge "Update the divider visibility when moveToStage" into udc-dev am: fa753af2

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

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

parents 2d5fd6cd fa753af2

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

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -359,6 +359,9 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
	if (task == null) {		if (task == null) {
	throw new IllegalArgumentException("Unknown taskId" + taskId);		throw new IllegalArgumentException("Unknown taskId" + taskId);
	}		}
			if (isTaskInSplitScreen(taskId)) {
			throw new IllegalArgumentException("taskId is in split" + taskId);
			}
	return mStageCoordinator.moveToStage(task, stagePosition, wct);		return mStageCoordinator.moveToStage(task, stagePosition, wct);
	}		}

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -395,6 +395,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
	mSyncQueue.queue(wct);		mSyncQueue.queue(wct);
	mSyncQueue.runInSync(t -> {		mSyncQueue.runInSync(t -> {
	updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */);		updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */);
			setDividerVisibility(true, t);
	});		});
	} else {		} else {
	setSideStagePosition(sideStagePosition, wct);		setSideStagePosition(sideStagePosition, wct);