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

Commit 5e769de2 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Delete Falsing for long tap flag" into udc-dev am: 3d76ddc1 am: 68bd2035"

parents 04255fd3 3388c080

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

+0 −4
Original line number Diff line number Diff line
@@ -324,10 +324,6 @@ public class BrightLineFalsingManager implements FalsingManager { 


    @Override

    public boolean isFalseLongTap(@Penalty int penalty) {

        if (!mFeatureFlags.isEnabled(Flags.FALSING_FOR_LONG_TAPS)) {

            return false;

        }



        checkDestroyed();



        if (skipFalsing(GENERIC)) {

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3
Original line number Diff line number Diff line
@@ -648,9 +648,6 @@ object Flags { 
    val APP_PANELS_REMOVE_APPS_ALLOWED =

        unreleasedFlag(2003, "app_panels_remove_apps_allowed", teamfood = true)



    // 2100 - Falsing Manager

    @JvmField val FALSING_FOR_LONG_TAPS = releasedFlag(2100, "falsing_for_long_taps")



    // 2200 - udfps

    // TODO(b/259264861): Tracking Bug

    @JvmField val UDFPS_NEW_TOUCH_DETECTION = releasedFlag(2200, "udfps_new_touch_detection")

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

+0 −8
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ public class BrightLineClassifierTest extends SysuiTestCase { 
                gestureCompleteListenerCaptor.capture());



        mGestureFinalizedListener = gestureCompleteListenerCaptor.getValue();

        mFakeFeatureFlags.set(Flags.FALSING_FOR_LONG_TAPS, true);

        mFakeFeatureFlags.set(Flags.MEDIA_FALSING_PENALTY, true);

        mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true);

    }
@@ -259,13 +258,6 @@ public class BrightLineClassifierTest extends SysuiTestCase { 
        verify(mLongTapClassifier).isTap(mMotionEventList, 0);

    }



    @Test

    public void testIsFalseLongTap_FalseLongTap_NotFlagged() {

        mFakeFeatureFlags.set(Flags.FALSING_FOR_LONG_TAPS, false);

        when(mLongTapClassifier.isTap(mMotionEventList, 0)).thenReturn(mFalsedResult);

        assertThat(mBrightLineFalsingManager.isFalseLongTap(NO_PENALTY)).isFalse();

    }



    @Test

    public void testIsFalseLongTap_FalseLongTap() {

        when(mLongTapClassifier.isTap(mMotionEventList, 0)).thenReturn(mFalsedResult);

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

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { 
                mMetricsLogger, mClassifiers, mSingleTapClassifier, mLongTapClassifier,

                mDoubleTapClassifier, mHistoryTracker, mKeyguardStateController,

                mAccessibilityManager, false, mFakeFeatureFlags);

        mFakeFeatureFlags.set(Flags.FALSING_FOR_LONG_TAPS, true);

        mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true);

    }