Merge "Fix mismatching surfaces position when entering split with two intents" into udc-qpr-dev

This commit is contained in:
Jerry Chang
2023-07-11 02:14:22 +00:00
committed by Android (Google) Code Review

View File

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