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

Commit 2040daa6 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Correct grantFocusToPostion logic" into main

parents f82b9ca5 30961bd2

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() {