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

Commit 5dd3393b authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

[Floaty] Fix animation not cancelled in some cases 

With the right timing of releasing the power button, the squeeze effect
is not cancelled sometimes. This happens when the animator has been
started but the progress is still at 0.

Bug: 417161351
Flag: com.android.systemui.shared.enable_lpp_assist_invocation_effect
Test: TopLevelWindowEffectsTest
Test: Manual, i.e. verified that the bug is no longer reproducible with
      this fix.
Change-Id: Iae742ba8a8806be53271af1ad11939d6c8e67e59
parent 2be72ae9

packages/SystemUI/src/com/android/systemui/topwindoweffects/TopLevelWindowEffects.kt

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ constructor( 
    }



    private fun cancelSqueeze() {

        if (isAnimationInterruptible && squeezeProgress != 0f) {

        if (isAnimationInterruptible && animator != null) {

            hapticPlayer?.cancel()

            animateSqueezeProgressTo(

                targetProgress = 0f,
@@ -141,6 +141,7 @@ constructor( 
    }



    private fun finishAnimation() {

        animator = null

        isAnimationInterruptible = true

    }