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

Commit 3d4d8e76 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Fix FalsingManager when a11y is on." into sc-qpr1-dev am: 90d1da49 am: d4ee6713 

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

Change-Id: I9784b2065dc7daa635dcd9c71ed8f8f69f9daff1
parents 9c925277 d4ee6713

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

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

+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();

    }