Merge "Fix dismissing wrong stage when droping divider to the edge" into sc-dev

2021-03-02 00:24:43 +00:00
parent af1ec28daa b194837fed
commit 2f3b22c90a
1 changed files with 3 additions and 2 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -362,8 +362,9 @@ class StageCoordinator implements SplitLayout.LayoutChangeListener,

    @Override
    public void onSnappedToDismiss(boolean bottomOrRight) {
-        final boolean mainStageToTop = bottomOrRight
-                && mSideStagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT;
+        final boolean mainStageToTop =
+                bottomOrRight ? mSideStagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT
+                        : mSideStagePosition == STAGE_POSITION_TOP_OR_LEFT;
        exitSplitScreen(mainStageToTop ? mMainStage : mSideStage);
    }