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

Merge "Fix wrong split layout after drag drop" into tm-qpr-dev

Browse Source
This commit is contained in:
Tony Huang
2022-07-27 05:40:41 +00:00
committed by Android (Google) Code Review
parent 89487c8ad2 55f0c287b7
commit 99933f97b6
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
View File

@@ -398,8 +398,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
return; return;
} }
mStageCoordinator.updateSurfaceBounds(null /* layout */, t,
false /* applyResizingOffset */);
for (int i = 0; i < apps.length; ++i) { for (int i = 0; i < apps.length; ++i) {
if (apps[i].mode == MODE_OPENING) { if (apps[i].mode == MODE_OPENING) {
t.show(apps[i].leash); t.show(apps[i].leash);

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

@@ -1283,7 +1283,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
private void onStageHasChildrenChanged(StageListenerImpl stageListener) { private void onStageHasChildrenChanged(StageListenerImpl stageListener) {
final boolean hasChildren = stageListener.mHasChildren; final boolean hasChildren = stageListener.mHasChildren;
final boolean isSideStage = stageListener == mSideStageListener; final boolean isSideStage = stageListener == mSideStageListener;
if (!hasChildren && !mIsExiting) { if (!hasChildren && !mIsExiting && mMainStage.isActive()) {
if (isSideStage && mMainStageListener.mVisible) { if (isSideStage && mMainStageListener.mVisible) {
// Exit to main stage if side stage no longer has children. // Exit to main stage if side stage no longer has children.
if (ENABLE_SHELL_TRANSITIONS) { if (ENABLE_SHELL_TRANSITIONS) {
@@ -1303,7 +1303,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
EXIT_REASON_APP_FINISHED); EXIT_REASON_APP_FINISHED);
} }
} }
} else if (isSideStage && !mMainStage.isActive()) { } else if (isSideStage && hasChildren && !mMainStage.isActive()) {
if (mFocusingTaskInfo != null && !isValidToEnterSplitScreen(mFocusingTaskInfo)) { if (mFocusingTaskInfo != null && !isValidToEnterSplitScreen(mFocusingTaskInfo)) {
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
mSideStage.removeAllTasks(wct, true); mSideStage.removeAllTasks(wct, true);