Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I277300de156e54c510ffbddfc80bb74b62999321
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:00:51 +00:00
committed by Automerger Merge Worker
parent b9f935f580 4f0a4c94d8
commit 3abbc9abc9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
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) {