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

Commit 3e3c9b80 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

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

This reverts commit 67c1a6b2.

Reason for revert: b/433842249

In some cases we actually want to emit a CANCEL_SQUEEZE event when the
squeeze effect is disabled. Namely, when the effect gets disabled while
an animation is in progress. This happens on tablets sometimes because
the active assistant changes frequently on tablets. While locked,
tablets have Google Assistant active and while unlocked tablets have
Gemini active. So whenever the device is locked or unlocked, the active
assistant changes.

Bug: 433842249
Test: SqueezeEffectInteractorTest
Test: Manual, i.e. verified on tablets that invocation effect never
      plays when turning on the display with the power button.
Change-Id: Ide6ec19dc74672ca0860aba3f74f4f285c53076b
parent 67c1a6b2

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

+4 −4
Original line number Diff line number Diff line
@@ -42,14 +42,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
@@ -114,7 +114,7 @@ class SqueezeEffectInteractorTest : SysuiTestCase() { 
        }



    @Test

    fun powerButtonSemantics_onLPPAndDisabledAndPowerKeyNotAsSingleGesture_isNull() =

    fun powerButtonSemantics_onLPPAndDisabledAndPowerKeyNotAsSingleGesture_cancelsSqueeze() =

        kosmos.runTest {

            fakeSqueezeEffectRepository.isEffectEnabled.value = false

            fakeSqueezeEffectRepository.isPowerButtonPressedAsSingleGesture.value = false
@@ -122,6 +122,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 ->