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

Commit 8e9d05ef authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Make sure DividerFreeSnapMode work as expected" into udc-qpr-dev

parents 4d9c375c 0255707e

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

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { 
                "Set divider bar %s from %s", interactive ? "interactive" : "non-interactive",

                from);

        mInteractive = interactive;

        if (!mInteractive && mMoving) {

        if (!mInteractive && hideHandle && mMoving) {

            final int position = mSplitLayout.getDividePosition();

            mSplitLayout.flingDividePosition(

                    mLastDraggingPosition,

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

+5 −1
Original line number Diff line number Diff line
@@ -323,7 +323,11 @@ public class SplitDecorManager extends WindowlessWindowManager { 
            }

        }

        if (mShown) {

            fadeOutDecor(()-> animFinishedCallback.accept(true));

            fadeOutDecor(()-> {

                if (mRunningAnimationCount == 0 && animFinishedCallback != null) {

                    animFinishedCallback.accept(true);

                }

            });

        } else {

            // Decor surface is hidden so release it directly.

            releaseDecor(t);

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

+0 −3
Original line number Diff line number Diff line
@@ -593,9 +593,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    void flingDividePosition(int from, int to, int duration,

            @Nullable Runnable flingFinishedCallback) {

        if (from == to) {

            // No animation run, still callback to stop resizing.

            mSplitLayoutHandler.onLayoutSizeChanged(this);



            if (flingFinishedCallback != null) {

                flingFinishedCallback.run();

            }