Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30961bd2 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Correct grantFocusToPostion logic 

Forgot about passed in leftOrTop

Bug: 322896230
Test: The left and right shortcut actually makes a difference
Change-Id: Ib56a1d19b90da5300e9dae31bb0487807db07320
parent 0ca0edda

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

+7 −2
Original line number Diff line number Diff line
@@ -1593,8 +1593,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    }



    protected void grantFocusToPosition(boolean leftOrTop) {

        grantFocusToStage(mSideStagePosition == SPLIT_POSITION_BOTTOM_OR_RIGHT

                ? getMainStagePosition() : getSideStagePosition());

        int stageToFocus;

        if (mSideStagePosition == SPLIT_POSITION_BOTTOM_OR_RIGHT) {

            stageToFocus = leftOrTop ? getMainStagePosition() : getSideStagePosition();

        } else {

            stageToFocus = leftOrTop ? getSideStagePosition() : getMainStagePosition();

        }

        grantFocusToStage(stageToFocus);

    }



    private void clearRequestIfPresented() {