From b194837fed1c0880fadf55647dca814e897a1479 Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Fri, 26 Feb 2021 14:36:12 +0800 Subject: [PATCH] Fix dismissing wrong stage when droping divider to the edge Fix: 181143181 Test: manual check Test: atest WMShellUnitTests Change-Id: I273594fe25d4b4efe060180b876446ebc1daede8 --- .../com/android/wm/shell/splitscreen/StageCoordinator.java | 5 +++-- 1 file 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 22c97515ad76d..bbfbc4098d924 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); }