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

Commit 91a5ce30 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix not showing divider when re-entering split with rotation" into... 

Merge "Fix not showing divider when re-entering split with rotation" into udc-dev am: a30b77d0 am: 819712bf

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



Change-Id: Ib987bfa72572ef793355be6c80440282ab7f2d5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5432727 819712bf

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+4 −1
Original line number Diff line number Diff line
@@ -412,7 +412,10 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 


    /** Releases and re-inflates {@link DividerView} on the root surface. */

    public void update(SurfaceControl.Transaction t) {

        if (!mInitialized) return;

        if (!mInitialized) {

            init();

            return;

        }

        mSplitWindowManager.release(t);

        mImePositionProcessor.reset();

        mSplitWindowManager.init(this, mInsetsState);

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

+1 −1
Original line number Diff line number Diff line
@@ -1538,7 +1538,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    }



    void finishEnterSplitScreen(SurfaceControl.Transaction t) {

        mSplitLayout.init();

        mSplitLayout.update(t);

        setDividerVisibility(true, t);

        // Ensure divider surface are re-parented back into the hierarchy at the end of the

        // transition. See Transition#buildFinishTransaction for more detail.