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

Commit 73d69a23 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix the crash on animating the accessibility floating menu."... 

Merge "Merge "Fix the crash on animating the accessibility floating menu." into tm-qpr-dev am: 61ee63dc" into tm-qpr-dev-plus-aosp
parents bfd72e36 fb593f65

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

+1 −0
Original line number Diff line number Diff line
@@ -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

+10 −0
Original line number Diff line number Diff line
@@ -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);