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

Merge "Increasing Penalty on UMO taps" into tm-qpr-dev

Browse Source
This commit is contained in:
Michael Mikhail
2022-11-15 15:50:26 +00:00
committed by Android (Google) Code Review
parent f286b827fd 1952bb6239
commit 3c410d04e6
6 changed files with 19 additions and 5 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

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

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

@@ -275,6 +275,8 @@ object Flags {
// TODO(b/254513168): Tracking Bug // TODO(b/254513168): Tracking Bug
@JvmField val UMO_SURFACE_RIPPLE = unreleasedFlag(907, "umo_surface_ripple") @JvmField val UMO_SURFACE_RIPPLE = unreleasedFlag(907, "umo_surface_ripple")
@JvmField val MEDIA_FALSING_PENALTY = unreleasedFlag(908, "media_falsing_media")
// 1000 - dock // 1000 - dock
val SIMULATE_DOCK_THROUGH_CHARGING = releasedFlag(1000, "simulate_dock_through_charging") val SIMULATE_DOCK_THROUGH_CHARGING = releasedFlag(1000, "simulate_dock_through_charging")

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

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

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

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

3
packages/SystemUI/tests/src/com/android/systemui/media/controls/models/player/SeekBarViewModelTest.kt
View File

@@ -42,6 +42,7 @@ import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor import org.mockito.ArgumentCaptor
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito.any import org.mockito.Mockito.any
import org.mockito.Mockito.anyInt
import org.mockito.Mockito.eq import org.mockito.Mockito.eq
import org.mockito.Mockito.mock import org.mockito.Mockito.mock
import org.mockito.Mockito.never import org.mockito.Mockito.never
@@ -464,7 +465,7 @@ public class SeekBarViewModelTest : SysuiTestCase() {
fun onFalseTapOrTouch() { fun onFalseTapOrTouch() {
whenever(mockController.getTransportControls()).thenReturn(mockTransport) whenever(mockController.getTransportControls()).thenReturn(mockTransport)
whenever(falsingManager.isFalseTouch(Classifier.MEDIA_SEEKBAR)).thenReturn(true) whenever(falsingManager.isFalseTouch(Classifier.MEDIA_SEEKBAR)).thenReturn(true)
whenever(falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)).thenReturn(true) whenever(falsingManager.isFalseTap(anyInt())).thenReturn(true)
viewModel.updateController(mockController) viewModel.updateController(mockController)
val pos = 169 val pos = 169

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

@@ -212,7 +212,10 @@ public class MediaControlPanelTest : SysuiTestCase() {
private lateinit var recSubtitle3: TextView private lateinit var recSubtitle3: TextView
private var shouldShowBroadcastButton: Boolean = false private var shouldShowBroadcastButton: Boolean = false
private val fakeFeatureFlag = private val fakeFeatureFlag =
FakeFeatureFlags().apply { this.set(Flags.UMO_SURFACE_RIPPLE, false) } FakeFeatureFlags().apply {
this.set(Flags.UMO_SURFACE_RIPPLE, false)
this.set(Flags.MEDIA_FALSING_PENALTY, true)
}
@JvmField @Rule val mockito = MockitoJUnit.rule() @JvmField @Rule val mockito = MockitoJUnit.rule()