Merge "Fix mismatching surfaces position when entering split with two intents" into udc-qpr-dev am: 4f0a4c94d8 am: 3abbc9abc9

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

Change-Id: I4222c746f9e2c30f1a4b1af478f78bc67d4ff1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jerry Chang
2023-07-11 03:16:55 +00:00
committed by Automerger Merge Worker

View File

@@ -740,12 +740,12 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
mMainStage.activate(wct, false /* reparent */);
}
setSideStagePosition(splitPosition, wct);
mSplitLayout.setDivideRatio(splitRatio);
updateWindowBounds(mSplitLayout, wct);
wct.reorder(mRootTaskInfo.token, true);
setRootForceTranslucent(false, wct);
setSideStagePosition(splitPosition, wct);
options1 = options1 != null ? options1 : new Bundle();
addActivityOptions(options1, mSideStage);
if (shortcutInfo1 != null) {