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

Merge "Fix FalsingManager when a11y is on." into sc-qpr1-dev

Browse Source
This commit is contained in:
Dave Mankoff
2021-10-19 16:41:16 +00:00
committed by Android (Google) Code Review
parent 7de25b844e 9fec4869c8
commit 90d1da4955
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java
View File

@@ -330,7 +330,7 @@ public class BrightLineFalsingManager implements FalsingManager {
|| mTestHarness || mTestHarness
|| mDataProvider.isJustUnlockedWithFace() || mDataProvider.isJustUnlockedWithFace()
|| mDataProvider.isDocked() || mDataProvider.isDocked()
|| mAccessibilityManager.isEnabled(); || mAccessibilityManager.isTouchExplorationEnabled();
} }
@Override @Override

6
packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java
View File

@@ -91,7 +91,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase {
@Test @Test
public void testA11yDisablesGesture() { public void testA11yDisablesGesture() {
assertThat(mBrightLineFalsingManager.isFalseTap(1)).isTrue(); assertThat(mBrightLineFalsingManager.isFalseTap(1)).isTrue();
when(mAccessibilityManager.isEnabled()).thenReturn(true); when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true);
assertThat(mBrightLineFalsingManager.isFalseTap(1)).isFalse(); assertThat(mBrightLineFalsingManager.isFalseTap(1)).isFalse();
} }
@@ -99,7 +99,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase {
@Test @Test
public void testA11yDisablesTap() { public void testA11yDisablesTap() {
assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isTrue(); assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isTrue();
when(mAccessibilityManager.isEnabled()).thenReturn(true); when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true);
assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse(); assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse();
} }
@@ -107,7 +107,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase {
@Test @Test
public void testA11yDisablesDoubleTap() { public void testA11yDisablesDoubleTap() {
assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isTrue(); assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isTrue();
when(mAccessibilityManager.isEnabled()).thenReturn(true); when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true);
assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isFalse(); assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isFalse();
} }