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

Commit dc798489 authored by Juan Sebastian Martinez's avatar Juan Sebastian Martinez
Browse files

Removing Failure haptics when QS tiles don't handle long clicks 

Test: TileHapticsViewModelTest
Flag: com.android.systemui.msdl_feedback
Bug: 378901075
Change-Id: I8cb0041f2321283f8782bd4d70d39af35160fbf7
parent ec13cf21

packages/SystemUI/multivalentTests/src/com/android/systemui/haptics/msdl/qs/TileHapticsViewModelTest.kt

+0 −16
Original line number Diff line number Diff line
@@ -118,22 +118,6 @@ class TileHapticsViewModelTest : SysuiTestCase() { 
            assertThat(msdlPlayer.latestPropertiesPlayed).isNull()

        }



    @Test

    fun onLongClick_whenTileDoesNotHandleLongClick_playsFailureHaptics() =

        testScope.runTest {

            // WHEN the tile is long-clicked but the tile does not handle a long-click

            val state = QSTile.State().apply { handlesLongClick = false }

            qsTile.changeState(state)

            underTest.setTileInteractionState(

                TileHapticsViewModel.TileInteractionState.LONG_CLICKED

            )

            runCurrent()



            // THEN the failure token plays

            assertThat(msdlPlayer.latestTokenPlayed).isEqualTo(MSDLToken.FAILURE)

            assertThat(msdlPlayer.latestPropertiesPlayed).isNull()

        }



    @Test

    fun whenLaunchingFromClick_doesNotPlayHaptics() =

        testScope.runTest {

packages/SystemUI/src/com/android/systemui/haptics/msdl/qs/TileHapticsViewModel.kt

+0 −5
Original line number Diff line number Diff line
@@ -83,9 +83,6 @@ constructor( 
                    interactionState == TileInteractionState.LONG_CLICKED &&

                        animationState == TileAnimationState.ACTIVITY_LAUNCH ->

                        TileHapticsState.LONG_PRESS

                    interactionState == TileInteractionState.LONG_CLICKED &&

                        !tileViewModel.currentState.handlesLongClick ->

                        TileHapticsState.FAILED_LONGPRESS

                    else -> TileHapticsState.NO_HAPTICS

                }

            }
@@ -102,7 +99,6 @@ constructor( 
                        TileHapticsState.TOGGLE_ON -> MSDLToken.SWITCH_ON

                        TileHapticsState.TOGGLE_OFF -> MSDLToken.SWITCH_OFF

                        TileHapticsState.LONG_PRESS -> MSDLToken.LONG_PRESS

                        TileHapticsState.FAILED_LONGPRESS -> MSDLToken.FAILURE

                        TileHapticsState.NO_HAPTICS -> null

                    }

                tokenToPlay?.let {
@@ -154,7 +150,6 @@ constructor( 
        TOGGLE_ON,

        TOGGLE_OFF,

        LONG_PRESS,

        FAILED_LONGPRESS,

        NO_HAPTICS,

    }