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

Commit cde14e97 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Set resizing to false if no fling animation" into sc-v2-dev am: 6366de23 am: bf931a7a 

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

Change-Id: I71a6ddfe8736d7ba3da12b79f03ea20306fddee7
parents 86922cea bf931a7a

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();

    }