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

Commit 65efd028 authored by Maryam Dehaini's avatar Maryam Dehaini
Browse files

Cancel icon animation when resize veil is released 

Icon animation needs to be cancelled along with the veil animation when
the surfaces are released.

Bug: 394602556
Test: resize task
Flag: com.android.window.flags.enable_desktop_windowing_mode
Change-Id: If02366f72c7f4f1524956613d44e8a5e76fd9c7e
parent 10d770d4

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.kt

+7 −3
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ public class ResizeVeil @JvmOverloads constructor( 
    private var viewHost: SurfaceControlViewHost? = null

    private var display: Display? = null

    private var veilAnimator: ValueAnimator? = null

    private var iconAnimator: ValueAnimator? = null

    private var loadAppInfoJob: Job? = null



    /**
@@ -241,7 +242,7 @@ public class ResizeVeil @JvmOverloads constructor( 
                    }

                })

            }

            val iconAnimator = ValueAnimator.ofFloat(0f, 1f).apply {

            iconAnimator = ValueAnimator.ofFloat(0f, 1f).apply {

                duration = RESIZE_ALPHA_DURATION

                addUpdateListener {

                    iconAnimT.setAlpha(icon, animatedValue as Float)
@@ -265,7 +266,7 @@ public class ResizeVeil @JvmOverloads constructor( 
                    .hide(background)

                    .apply()

            veilAnimator?.start()

            iconAnimator.start()

            iconAnimator?.start()

        } else {

            // Show the veil immediately.

            t.apply()
@@ -414,6 +415,10 @@ public class ResizeVeil @JvmOverloads constructor( 
    private fun cancelAnimation() {

        veilAnimator?.removeAllUpdateListeners()

        veilAnimator?.cancel()

        veilAnimator = null

        iconAnimator?.removeAllUpdateListeners()

        iconAnimator?.cancel()

        iconAnimator = null

    }



    /**
@@ -421,7 +426,6 @@ public class ResizeVeil @JvmOverloads constructor( 
     */

    fun dispose() {

        cancelAnimation()

        veilAnimator = null

        isVisible = false

        loadAppInfoJob?.cancel()