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

Commit 55940174 authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "Don't skip falsing on non-foldable devices" into tm-qpr-dev

parents 8649923e 58649a6c

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

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ public class BrightLineFalsingManager implements FalsingManager { 
                || mAccessibilityManager.isTouchExplorationEnabled()

                || mDataProvider.isA11yAction()

                || (mFeatureFlags.isEnabled(Flags.FALSING_OFF_FOR_UNFOLDED)

                    && !mDataProvider.isFolded());

                    && mDataProvider.isUnfolded());

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -380,8 +380,8 @@ public class FalsingDataProvider { 
        return mBatteryController.isWirelessCharging() || mDockManager.isDocked();

    }



    public boolean isFolded() {

        return Boolean.TRUE.equals(mFoldStateListener.getFolded());

    public boolean isUnfolded() {

        return Boolean.FALSE.equals(mFoldStateListener.getFolded());

    }



    /** Implement to be alerted abotu the beginning and ending of falsing tracking. */

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

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public class BrightLineClassifierTest extends SysuiTestCase { 
        mClassifiers.add(mClassifierB);

        when(mFalsingDataProvider.getRecentMotionEvents()).thenReturn(mMotionEventList);

        when(mKeyguardStateController.isShowing()).thenReturn(true);

        when(mFalsingDataProvider.isFolded()).thenReturn(true);

        when(mFalsingDataProvider.isUnfolded()).thenReturn(false);

        mBrightLineFalsingManager = new BrightLineFalsingManager(mFalsingDataProvider,

                mMetricsLogger, mClassifiers, mSingleTapClassfier, mLongTapClassifier,

                mDoubleTapClassifier, mHistoryTracker, mKeyguardStateController,

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

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { 
        mClassifiers.add(mClassifierA);

        when(mFalsingDataProvider.getRecentMotionEvents()).thenReturn(mMotionEventList);

        when(mKeyguardStateController.isShowing()).thenReturn(true);

        when(mFalsingDataProvider.isFolded()).thenReturn(true);

        when(mFalsingDataProvider.isUnfolded()).thenReturn(false);

        mBrightLineFalsingManager = new BrightLineFalsingManager(mFalsingDataProvider,

                mMetricsLogger, mClassifiers, mSingleTapClassifier, mLongTapClassifier,

                mDoubleTapClassifier, mHistoryTracker, mKeyguardStateController,
@@ -185,7 +185,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { 
    @Test

    public void testSkipUnfolded() {

        assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isTrue();

        when(mFalsingDataProvider.isFolded()).thenReturn(false);

        when(mFalsingDataProvider.isUnfolded()).thenReturn(true);

        assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse();

    }

}

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

+8 −2
Original line number Diff line number Diff line
@@ -324,12 +324,18 @@ public class FalsingDataProviderTest extends ClassifierTest { 
    @Test

    public void test_FoldedState_Folded() {

        when(mFoldStateListener.getFolded()).thenReturn(true);

        assertThat(mDataProvider.isFolded()).isTrue();

        assertThat(mDataProvider.isUnfolded()).isFalse();

    }



    @Test

    public void test_FoldedState_Unfolded() {

        when(mFoldStateListener.getFolded()).thenReturn(false);

        assertThat(mDataProvider.isFolded()).isFalse();

        assertThat(mDataProvider.isUnfolded()).isTrue();

    }



    @Test

    public void test_FoldedState_NotFoldable() {

        when(mFoldStateListener.getFolded()).thenReturn(null);

        assertThat(mDataProvider.isUnfolded()).isFalse();

    }

}