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

Merge "Fix surface got offsetted twice while entering split" into sc-v2-dev

Browse Source
This commit is contained in:
Jerry Chang
2021-09-30 00:29:46 +00:00
committed by Android (Google) Code Review
parent 35bcf44342 a0c224dba7
commit 8366d0347c
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,8 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
setSideStagePosition(sideStagePosition, wct); setSideStagePosition(sideStagePosition, wct);
mMainStage.activate(getMainStageBounds(), wct); mMainStage.activate(getMainStageBounds(), wct);
mSideStage.addTask(task, getSideStageBounds(), wct); mSideStage.addTask(task, getSideStageBounds(), wct);
mTaskOrganizer.applyTransaction(wct); mSyncQueue.queue(wct);
mSyncQueue.runInSync(t -> updateSurfaceBounds(null /* layout */, t));
return true; return true;
} }
@@ -446,15 +447,15 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
setSideStagePosition(sideStagePosition, true /* updateBounds */, wct); setSideStagePosition(sideStagePosition, true /* updateBounds */, wct);
} }
private void setSideStagePosition(@SplitPosition int sideStagePosition, private void setSideStagePosition(@SplitPosition int sideStagePosition, boolean updateBounds,
boolean updateBounds, @Nullable WindowContainerTransaction wct) { @Nullable WindowContainerTransaction wct) {
if (mSideStagePosition == sideStagePosition) return; if (mSideStagePosition == sideStagePosition) return;
mSideStagePosition = sideStagePosition; mSideStagePosition = sideStagePosition;
sendOnStagePositionChanged(); sendOnStagePositionChanged();
if (mSideStageListener.mVisible && updateBounds) { if (mSideStageListener.mVisible && updateBounds) {
if (wct == null) { if (wct == null) {
// onBoundsChanged builds/applies a wct with the contents of updateWindowBounds. // onLayoutChanged builds/applies a wct with the contents of updateWindowBounds.
onLayoutChanged(mSplitLayout); onLayoutChanged(mSplitLayout);
} else { } else {
updateWindowBounds(mSplitLayout, wct); updateWindowBounds(mSplitLayout, wct);
@@ -675,29 +676,11 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
} }
mSyncQueue.runInSync(t -> { mSyncQueue.runInSync(t -> {
final SurfaceControl sideStageLeash = mSideStage.mRootLeash;
final SurfaceControl mainStageLeash = mMainStage.mRootLeash;
if (sideStageVisible) {
final Rect sideStageBounds = getSideStageBounds();
t.setPosition(sideStageLeash,
sideStageBounds.left, sideStageBounds.top)
.setWindowCrop(sideStageLeash,
sideStageBounds.width(), sideStageBounds.height());
}
if (mainStageVisible) {
final Rect mainStageBounds = getMainStageBounds();
t.setPosition(mainStageLeash, mainStageBounds.left, mainStageBounds.top)
.setWindowCrop(mainStageLeash,
mainStageBounds.width(), mainStageBounds.height());
}
// Same above, we only set root tasks and divider leash visibility when both stage // Same above, we only set root tasks and divider leash visibility when both stage
// change to visible or invisible to avoid flicker. // change to visible or invisible to avoid flicker.
if (sameVisibility) { if (sameVisibility) {
t.setVisibility(sideStageLeash, bothStageVisible) t.setVisibility(mSideStage.mRootLeash, bothStageVisible)
.setVisibility(mainStageLeash, bothStageVisible); .setVisibility(mMainStage.mRootLeash, bothStageVisible);
applyDividerVisibility(t); applyDividerVisibility(t);
} }
}); });