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

Commit 7c4d6e61 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "Set divider visibility to false when #prepareExitSplitScreen." into main

parents 6f428547 1287d936

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

+1 −0
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ public class SplitScreenController implements SplitDragPolicy.Starter, 
    public void prepareExitSplitScreen(WindowContainerTransaction wct,

            @StageType int stageToTop, @ExitReason int reason) {

        mStageCoordinator.prepareExitSplitScreen(stageToTop, wct, reason);

        mStageCoordinator.setDividerVisibility(false, null);

        mStageCoordinator.clearSplitPairedInRecents(reason);

    }

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

+5 −3
Original line number Diff line number Diff line
@@ -2414,9 +2414,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        setDividerVisibility(mainStageVisible, null);

    }



    // Set divider visibility flag and try to apply it, the param transaction is used to apply.

    // See applyDividerVisibility for more detail.

    private void setDividerVisibility(boolean visible, @Nullable SurfaceControl.Transaction t) {

    /**

     * Set divider visibility flag and try to apply it, the param transaction is used to apply.

     * See applyDividerVisibility for more detail.

     */

    public void setDividerVisibility(boolean visible, @Nullable SurfaceControl.Transaction t) {

        if (visible == mDividerVisible) {

            return;

        }