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

Merge "Delete Falsing for long tap flag" into udc-dev

Browse Source
This commit is contained in:
Michael Mikhail
2023-04-07 17:30:58 +00:00
committed by Android (Google) Code Review
parent 03aa365559 c009652f2b
commit 3d76ddc1c9
4 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -324,10 +324,6 @@ public class BrightLineFalsingManager implements FalsingManager {
@Override @Override
public boolean isFalseLongTap(@Penalty int penalty) { public boolean isFalseLongTap(@Penalty int penalty) {
if (!mFeatureFlags.isEnabled(Flags.FALSING_FOR_LONG_TAPS)) {
return false;
}
checkDestroyed(); checkDestroyed();
if (skipFalsing(GENERIC)) { if (skipFalsing(GENERIC)) {

3
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -648,9 +648,6 @@ object Flags {
val APP_PANELS_REMOVE_APPS_ALLOWED = val APP_PANELS_REMOVE_APPS_ALLOWED =
unreleasedFlag(2003, "app_panels_remove_apps_allowed", teamfood = true) 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 // 2200 - udfps
// TODO(b/259264861): Tracking Bug // TODO(b/259264861): Tracking Bug
@JvmField val UDFPS_NEW_TOUCH_DETECTION = releasedFlag(2200, "udfps_new_touch_detection") @JvmField val UDFPS_NEW_TOUCH_DETECTION = releasedFlag(2200, "udfps_new_touch_detection")

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

@@ -120,7 +120,6 @@ public class BrightLineClassifierTest extends SysuiTestCase {
gestureCompleteListenerCaptor.capture()); gestureCompleteListenerCaptor.capture());
mGestureFinalizedListener = gestureCompleteListenerCaptor.getValue(); mGestureFinalizedListener = gestureCompleteListenerCaptor.getValue();
mFakeFeatureFlags.set(Flags.FALSING_FOR_LONG_TAPS, true);
mFakeFeatureFlags.set(Flags.MEDIA_FALSING_PENALTY, true); mFakeFeatureFlags.set(Flags.MEDIA_FALSING_PENALTY, true);
mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true); mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true);
} }
@@ -259,13 +258,6 @@ public class BrightLineClassifierTest extends SysuiTestCase {
verify(mLongTapClassifier).isTap(mMotionEventList, 0); 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 @Test
public void testIsFalseLongTap_FalseLongTap() { public void testIsFalseLongTap_FalseLongTap() {
when(mLongTapClassifier.isTap(mMotionEventList, 0)).thenReturn(mFalsedResult); when(mLongTapClassifier.isTap(mMotionEventList, 0)).thenReturn(mFalsedResult);

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

@@ -94,7 +94,6 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase {
mMetricsLogger, mClassifiers, mSingleTapClassifier, mLongTapClassifier, mMetricsLogger, mClassifiers, mSingleTapClassifier, mLongTapClassifier,
mDoubleTapClassifier, mHistoryTracker, mKeyguardStateController, mDoubleTapClassifier, mHistoryTracker, mKeyguardStateController,
mAccessibilityManager, false, mFakeFeatureFlags); mAccessibilityManager, false, mFakeFeatureFlags);
mFakeFeatureFlags.set(Flags.FALSING_FOR_LONG_TAPS, true);
mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true); mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true);
} }