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

Commit d2383c69 authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix back to home animation restarts on a second swipe." into tm-qpr-dev am: a33be48b 

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



Change-Id: I81bca28c3c55c6d935986e144761b3a42af7e1c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2acbc9f9 a33be48b

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+14 −1
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 


    /** Tracks if an uninterruptible transition is in progress */

    private boolean mTransitionInProgress = false;

    /** Tracks if we should start the back gesture on the next motion move event */

    private boolean mShouldStartOnNextMoveEvent = false;

    /** @see #setTriggerBack(boolean) */

    private boolean mTriggerBack;
@@ -298,12 +300,17 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
        if (mTransitionInProgress) {

            return;

        }

        if (keyAction == MotionEvent.ACTION_MOVE) {

        if (keyAction == MotionEvent.ACTION_DOWN) {

            if (!mBackGestureStarted) {

                mShouldStartOnNextMoveEvent = true;

            }

        } else if (keyAction == MotionEvent.ACTION_MOVE) {

            if (!mBackGestureStarted && mShouldStartOnNextMoveEvent) {

                // Let the animation initialized here to make sure the onPointerDownOutsideFocus

                // could be happened when ACTION_DOWN, it may change the current focus that we

                // would access it when startBackNavigation.

                onGestureStarted(touchX, touchY);

                mShouldStartOnNextMoveEvent = false;

            }

            onMove(touchX, touchY, swipeEdge);

        } else if (keyAction == MotionEvent.ACTION_UP || keyAction == MotionEvent.ACTION_CANCEL) {
@@ -437,6 +444,11 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 


    private void onGestureFinished(boolean fromTouch) {

        ProtoLog.d(WM_SHELL_BACK_PREVIEW, "onGestureFinished() mTriggerBack == %s", mTriggerBack);

        if (!mBackGestureStarted) {

            finishAnimation();

            return;

        }



        if (fromTouch) {

            // Let touch reset the flag otherwise it will start a new back navigation and refresh

            // the info when received a new move event.
@@ -552,6 +564,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
        boolean triggerBack = mTriggerBack;

        mBackNavigationInfo = null;

        mTriggerBack = false;

        mShouldStartOnNextMoveEvent = false;

        if (backNavigationInfo == null) {

            return;

        }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java

+6 −1
Original line number Diff line number Diff line
@@ -284,9 +284,14 @@ public class BackAnimationControllerTest extends ShellTestCase { 
        // the previous transition is finished.

        doMotionEvent(MotionEvent.ACTION_DOWN, 0);

        verifyNoMoreInteractions(mIOnBackInvokedCallback);

        mController.onBackToLauncherAnimationFinished();



        // Verify that more events from a rejected swipe cannot start animation.

        doMotionEvent(MotionEvent.ACTION_MOVE, 100);

        doMotionEvent(MotionEvent.ACTION_UP, 0);

        verifyNoMoreInteractions(mIOnBackInvokedCallback);



        // Verify that we start accepting gestures again once transition finishes.

        mController.onBackToLauncherAnimationFinished();

        doMotionEvent(MotionEvent.ACTION_DOWN, 0);

        doMotionEvent(MotionEvent.ACTION_MOVE, 100);

        verify(mIOnBackInvokedCallback).onBackStarted();