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

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

Merge "[Floaty] Fix animation not cancelled in some cases" into main

parents 9efc269b 5dd3393b

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

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



    private fun cancelSqueeze() {

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

        if (isAnimationInterruptible && animator != null) {

            hapticPlayer?.cancel()

            animateSqueezeProgressTo(

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



    private fun finishAnimation() {

        animator = null

        isAnimationInterruptible = true

        setRequestTopUi(false)

    }