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

Commit 44fe1362 authored by David Lin's avatar David Lin Committed by Android (Google) Code Review
Browse files

Merge "Remove existing divider immediately when entering split" into 24D1-dev

parents 1d7ccdf2 954653cf

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

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ public final class SplitWindowManager extends WindowlessWindowManager { 
    /**

     * Releases the surface control of the current {@link DividerView} and tear down the view

     * hierarchy.

     * @param t If supplied, the surface removal will be bundled with this Transaction. If

     *          called with null, removes the surface immediately.

     */

    void release(@Nullable SurfaceControl.Transaction t) {

        if (mDividerView != null) {

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

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


    void finishEnterSplitScreen(SurfaceControl.Transaction finishT) {

        ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "finishEnterSplitScreen");

        mSplitLayout.update(finishT, true /* resetImePosition */);

        mSplitLayout.update(null, true /* resetImePosition */);

        mMainStage.getSplitDecorManager().inflate(mContext, mMainStage.mRootLeash,

                getMainStageBounds());

        mSideStage.getSplitDecorManager().inflate(mContext, mSideStage.mRootLeash,