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

Commit 562b85b6 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix broken layout after switched stage positions" into sc-v2-dev am: 3c96d584 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14700832

Change-Id: Ic2c635dc8267270e78759f0eddea05be0499704d
parents aa54db0f 3c96d584

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

+5 −5
Original line number Diff line number Diff line
@@ -253,17 +253,17 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    }



    void setSideStagePosition(@SplitPosition int sideStagePosition) {

        setSideStagePosition(sideStagePosition, true /* updateVisibility */);

        setSideStagePosition(sideStagePosition, true /* updateBounds */);

    }



    private void setSideStagePosition(@SplitPosition int sideStagePosition,

            boolean updateVisibility) {

            boolean updateBounds) {

        if (mSideStagePosition == sideStagePosition) return;

        mSideStagePosition = sideStagePosition;

        sendOnStagePositionChanged();



        if (mSideStageListener.mVisible && updateVisibility) {

            onStageVisibilityChanged(mSideStageListener);

        if (mSideStageListener.mVisible && updateBounds) {

            onBoundsChanged(mSplitLayout);

        }

    }
@@ -755,7 +755,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 


            // Update local states (before animating).

            setDividerVisibility(true);

            setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, false /* updateVisibility */);

            setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, false /* updateBounds */);

            setSplitsVisible(true);



            addDividerBarToTransition(info, t, true /* show */);