Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
PETER LIANG
2022-07-20 02:18:56 +00:00
committed by Android (Google) Code Review
parent c326217c51 f8852d87ba
commit 61ee63dc3b
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -190,6 +190,16 @@ public class AccessibilityFloatingMenuViewTest extends SysuiTestCase {
verify(mWindowManager, times(1)).removeView(eq(mMenuView)); 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 @Test
public void onTargetsChanged_singleTarget_expectedRadii() { public void onTargetsChanged_singleTarget_expectedRadii() {
final Position alignRightPosition = new Position(1.0f, 0.0f); final Position alignRightPosition = new Position(1.0f, 0.0f);