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

Commit 47ee9ad9 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Refine exit animation 

Don't move the other stack when exiting multi-window with undock
gesture.

Bug: 27154882
Change-Id: Ia2793d2e2b16def543289f8b2b13631db90edca8
parent 59d2a903

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+13 −1
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
    private boolean mGrowRecents;

    private ValueAnimator mCurrentAnimator;

    private boolean mEntranceAnimationRunning;

    private boolean mExitAnimationRunning;

    private int mExitStartPosition;

    private GestureDetector mGestureDetector;

    private boolean mDockedStackMinimized;
@@ -445,6 +447,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
                mDockSide = WindowManager.DOCKED_INVALID;

                mCurrentAnimator = null;

                mEntranceAnimationRunning = false;

                mExitAnimationRunning = false;

                EventBus.getDefault().send(new StoppedDragingEvent());

            }

        });
@@ -654,6 +657,13 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
                    mOtherTaskRect);

            mWindowManagerProxy.resizeDockedStack(mDockedRect, mDockedTaskRect, null,

                    mOtherTaskRect, null);

        } else if (mExitAnimationRunning && taskPosition != TASK_POSITION_SAME) {

            calculateBoundsForPosition(taskPosition,

                    mDockSide, mDockedTaskRect);

            calculateBoundsForPosition(mExitStartPosition,

                    DockedDividerUtils.invertDockSide(mDockSide), mOtherTaskRect);

            mWindowManagerProxy.resizeDockedStack(mDockedRect, mDockedTaskRect, null,

                    mOtherTaskRect, null);

        } else if (taskPosition != TASK_POSITION_SAME) {

            calculateBoundsForPosition(position, DockedDividerUtils.invertDockSide(mDockSide),

                    mOtherRect);
@@ -895,7 +905,9 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
                    : mSnapAlgorithm.getDismissStartTarget();



            // Don't start immediately - give a little bit time to settle the drag resize change.

            stopDragging(getCurrentPosition(), target, 336 /* duration */, 100 /* startDelay */,

            mExitAnimationRunning = true;

            mExitStartPosition = getCurrentPosition();

            stopDragging(mExitStartPosition, target, 336 /* duration */, 100 /* startDelay */,

                    Interpolators.TOUCH_RESPONSE);



            // Vibrate after undocking