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

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

Merge "Set resizing to false if no fling animation" into sc-v2-dev

parents 601a9767 3912b53d

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

+5 −1
Original line number Diff line number Diff line
@@ -286,7 +286,11 @@ public final class SplitLayout { 
    }



    private void flingDividePosition(int from, int to) {

        if (from == to) return;

        if (from == to) {

            // No animation run, it should stop resizing here.

            mSplitWindowManager.setResizingSplits(false);

            return;

        }

        ValueAnimator animator = ValueAnimator

                .ofInt(from, to)

                .setDuration(250);

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

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
    private void stopDragging() {

        mHandle.setTouching(false, true /* animate */);

        mWindowManager.setSlippery(true);

        mWindowManagerProxy.setResizing(false);

        releaseBackground();

    }