Merge "Fix FalsingManager when a11y is on." into sc-qpr1-dev (90d1da49) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java

+1 −1

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

		@Override

+3 −3

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase {
		@Test
		public void testA11yDisablesGesture() {
		assertThat(mBrightLineFalsingManager.isFalseTap(1)).isTrue();
		when(mAccessibilityManager.isEnabled()).thenReturn(true);
		when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true);
		assertThat(mBrightLineFalsingManager.isFalseTap(1)).isFalse();
		}

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

		@@ -107,7 +107,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase {
		@Test
		public void testA11yDisablesDoubleTap() {
		assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isTrue();
		when(mAccessibilityManager.isEnabled()).thenReturn(true);
		when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true);
		assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isFalse();
		}