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

Merge "Remove MEDIA_FALSING_PENALTY flag" into udc-dev

Browse Source
This commit is contained in:
Michael Mikhail
2023-05-18 13:54:14 +00:00
committed by Android (Google) Code Review
parent 1a445c1bdb 6fdce778bc
commit 55a04817d9
5 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,8 +232,7 @@ public class BrightLineFalsingManager implements FalsingManager {
// check for false tap if it is a seekbar interaction
if (interactionType == MEDIA_SEEKBAR) {
localResult[0] &= isFalseTap(mFeatureFlags.isEnabled(Flags.MEDIA_FALSING_PENALTY)
? FalsingManager.MODERATE_PENALTY : FalsingManager.LOW_PENALTY);
localResult[0] &= isFalseTap(FalsingManager.MODERATE_PENALTY);
}
logDebug("False Gesture (type: " + interactionType + "): " + localResult[0]);

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

@@ -391,8 +391,6 @@ object Flags {
// TODO(b/254513168): Tracking Bug
@JvmField val UMO_SURFACE_RIPPLE = releasedFlag(907, "umo_surface_ripple")
@JvmField val MEDIA_FALSING_PENALTY = releasedFlag(908, "media_falsing_media")
// TODO(b/261734857): Tracking Bug
@JvmField val UMO_TURBULENCE_NOISE = releasedFlag(909, "umo_turbulence_noise")

10
packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java
View File

@@ -617,10 +617,7 @@ public class MediaControlPanel {
seamlessView.setContentDescription(deviceString);
seamlessView.setOnClickListener(
v -> {
if (mFalsingManager.isFalseTap(
mFeatureFlags.isEnabled(Flags.MEDIA_FALSING_PENALTY)
? FalsingManager.MODERATE_PENALTY :
FalsingManager.LOW_PENALTY)) {
if (mFalsingManager.isFalseTap(FalsingManager.MODERATE_PENALTY)) {
return;
}
@@ -1130,10 +1127,7 @@ public class MediaControlPanel {
} else {
button.setEnabled(true);
button.setOnClickListener(v -> {
if (!mFalsingManager.isFalseTap(
mFeatureFlags.isEnabled(Flags.MEDIA_FALSING_PENALTY)
? FalsingManager.MODERATE_PENALTY :
FalsingManager.LOW_PENALTY)) {
if (!mFalsingManager.isFalseTap(FalsingManager.MODERATE_PENALTY)) {
mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId);
logSmartspaceCardReported(SMARTSPACE_CARD_CLICK_EVENT);
action.run();

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

@@ -120,7 +120,6 @@ public class BrightLineClassifierTest extends SysuiTestCase {
gestureCompleteListenerCaptor.capture());
mGestureFinalizedListener = gestureCompleteListenerCaptor.getValue();
mFakeFeatureFlags.set(Flags.MEDIA_FALSING_PENALTY, true);
mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true);
}

1
packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt
View File

@@ -230,7 +230,6 @@ public class MediaControlPanelTest : SysuiTestCase() {
FakeFeatureFlags().apply {
this.set(Flags.UMO_SURFACE_RIPPLE, false)
this.set(Flags.UMO_TURBULENCE_NOISE, false)
this.set(Flags.MEDIA_FALSING_PENALTY, true)
this.set(Flags.MEDIA_EXPLICIT_INDICATOR, true)
this.set(Flags.MEDIA_RECOMMENDATION_CARD_UPDATE, false)
}