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

Merge "Fix broken layout after switched stage positions" into sc-v2-dev

Browse Source
This commit is contained in:
Jerry Chang
2021-05-25 05:11:23 +00:00
committed by Android (Google) Code Review
parent 3134c919c4 d18a7bb158
commit 3c96d58450
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,17 +253,17 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
} }
void setSideStagePosition(@SplitPosition int sideStagePosition) { void setSideStagePosition(@SplitPosition int sideStagePosition) {
setSideStagePosition(sideStagePosition, true /* updateVisibility */); setSideStagePosition(sideStagePosition, true /* updateBounds */);
} }
private void setSideStagePosition(@SplitPosition int sideStagePosition, private void setSideStagePosition(@SplitPosition int sideStagePosition,
boolean updateVisibility) { boolean updateBounds) {
if (mSideStagePosition == sideStagePosition) return; if (mSideStagePosition == sideStagePosition) return;
mSideStagePosition = sideStagePosition; mSideStagePosition = sideStagePosition;
sendOnStagePositionChanged(); sendOnStagePositionChanged();
if (mSideStageListener.mVisible && updateVisibility) { if (mSideStageListener.mVisible && updateBounds) {
onStageVisibilityChanged(mSideStageListener); onBoundsChanged(mSplitLayout);
} }
} }
@@ -755,7 +755,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
// Update local states (before animating). // Update local states (before animating).
setDividerVisibility(true); setDividerVisibility(true);
setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, false /* updateVisibility */); setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, false /* updateBounds */);
setSplitsVisible(true); setSplitsVisible(true);
addDividerBarToTransition(info, t, true /* show */); addDividerBarToTransition(info, t, true /* show */);