diff options
| author | 2021-03-02 00:24:43 +0000 | |
|---|---|---|
| committer | 2021-03-02 00:24:43 +0000 | |
| commit | 2f3b22c90a389f20aaec28fe4d7d20f595b541cf (patch) | |
| tree | 951d700ea25b2825d0a6b4f1b33c8449a23bd51e | |
| parent | af1ec28daaafa490b1e4bab36977d08175245821 (diff) | |
| parent | b194837fed1c0880fadf55647dca814e897a1479 (diff) | |
Merge "Fix dismissing wrong stage when droping divider to the edge" into sc-dev
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index 22c97515ad76..bbfbc4098d92 100644 --- 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); } |