Merge "Fix the crash on animating the accessibility floating menu." into tm-qpr-dev am: 61ee63dc3b

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

Change-Id: I103c921851aefa2ee712e8d8be793aac6ebb337d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuView.java

@@ -353,6 +353,7 @@ public class AccessibilityFloatingMenuView extends FrameLayout
         }
 
         mIsShowing = false;
+        mDragAnimator.cancel();
         mWindowManager.removeView(this);
 
         setOnApplyWindowInsetsListener(null);

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuViewTest.java

@@ -190,6 +190,16 @@ public class AccessibilityFloatingMenuViewTest extends SysuiTestCase {
         verify(mWindowManager, times(1)).removeView(eq(mMenuView));
     }
 
+    @Test
+    public void hideMenuViewWhenStartingAnimation_animatorNotRunning() {
+        mMenuView.show();
+
+        mMenuView.mDragAnimator.start();
+        mMenuView.hide();
+
+        assertThat(mMenuView.mDragAnimator.isRunning()).isFalse();
+    }
+
     @Test
     public void onTargetsChanged_singleTarget_expectedRadii() {
         final Position alignRightPosition = new Position(1.0f, 0.0f);