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

Commit cb50c1f2 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Revert "[Floaty] Don't emit cancel event when effect is disabled"" into main

parents d3d84f7b 3e3c9b80

packages/SystemUI/multivalentTests/src/com/android/systemui/topwindoweffects/domain/interactor/SqueezeEffectInteractorTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ class SqueezeEffectInteractorTest : SysuiTestCase() { 
        }



    @Test

    fun powerButtonSemantics_powerKeyNotDownAsSingleGestureAndDisabled_isNull() =

    fun powerButtonSemantics_powerKeyNotDownAsSingleGestureAndDisabled_cancelsSqueeze() =

        kosmos.runTest {

            fakeSqueezeEffectRepository.isEffectEnabled.value = false

            fakeSqueezeEffectRepository.isPowerButtonPressedAsSingleGesture.value = false



            val powerButtonSemantics by collectLastValue(underTest.powerButtonSemantics)



            assertThat(powerButtonSemantics).isNull()

            assertThat(powerButtonSemantics).isEqualTo(PowerButtonSemantics.CANCEL_SQUEEZE)

        }



    @Test
@@ -113,7 +113,7 @@ class SqueezeEffectInteractorTest : SysuiTestCase() { 
        }



    @Test

    fun powerButtonSemantics_onLPPAndDisabledAndPowerKeyNotAsSingleGesture_isNull() =

    fun powerButtonSemantics_onLPPAndDisabledAndPowerKeyNotAsSingleGesture_cancelsSqueeze() =

        kosmos.runTest {

            fakeSqueezeEffectRepository.isEffectEnabled.value = false

            fakeSqueezeEffectRepository.isPowerButtonPressedAsSingleGesture.value = false
@@ -121,6 +121,6 @@ class SqueezeEffectInteractorTest : SysuiTestCase() { 


            val powerButtonSemantics by collectLastValue(underTest.powerButtonSemantics)



            assertThat(powerButtonSemantics).isNull()

            assertThat(powerButtonSemantics).isEqualTo(PowerButtonSemantics.CANCEL_SQUEEZE)

        }

}

packages/SystemUI/src/com/android/systemui/topwindoweffects/domain/interactor/SqueezeEffectInteractor.kt

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ constructor(private val squeezeEffectRepository: SqueezeEffectRepository) { 
            ) { isEnabled, isPowerButtonPressedAsSingleGesture, isPowerButtonLongPressed ->

                val useInitialRumble = squeezeEffectRepository.useHapticRumble()

                when {

                    isEnabled && !isPowerButtonPressedAsSingleGesture ->

                        PowerButtonSemantics.CANCEL_SQUEEZE

                    !isPowerButtonPressedAsSingleGesture -> PowerButtonSemantics.CANCEL_SQUEEZE

                    isEnabled && isPowerButtonPressedAsSingleGesture && useInitialRumble ->

                        PowerButtonSemantics.START_SQUEEZE_WITH_RUMBLE

                    isEnabled && isPowerButtonPressedAsSingleGesture && !useInitialRumble ->