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

Commit 7fa0d475 authored by Anton Potapov's avatar Anton Potapov
Browse files

Add ValueAnimator#awaitAnimation to await animation 

Flag: com.android.systemui.volume_redesign
Bug: 369992924
Test: N/A. Extends currently unused API
Change-Id: I2726531e40fd7f59ccbfa3366c8d4126480f0051
parent 046855a0

packages/SystemUI/src/com/android/systemui/volume/dialog/ui/utils/SuspendAnimators.kt

+32 −1
Original line number Diff line number Diff line
@@ -17,8 +17,11 @@ 
package com.android.systemui.volume.dialog.ui.utils



import android.animation.Animator

import android.animation.AnimatorListenerAdapter

import android.animation.ValueAnimator

import android.view.ViewPropertyAnimator

import kotlin.coroutines.resume

import kotlinx.coroutines.CancellableContinuation

import kotlinx.coroutines.suspendCancellableCoroutine



/**
@@ -39,11 +42,12 @@ suspend fun ViewPropertyAnimator.suspendAnimate( 
            }



            override fun onAnimationEnd(animation: Animator) {

                continuation.resume(Unit)

                continuation.resumeIfCan(Unit)

                animationListener?.onAnimationEnd(animation)

            }



            override fun onAnimationCancel(animation: Animator) {

                continuation.resumeIfCan(Unit)

                animationListener?.onAnimationCancel(animation)

            }
@@ -54,3 +58,30 @@ suspend fun ViewPropertyAnimator.suspendAnimate( 
    )

    continuation.invokeOnCancellation { this.cancel() }

}



/**

 * Starts animation and suspends until it's finished. Cancels the animation if the running coroutine

 * is cancelled.

 */

@Suppress("UNCHECKED_CAST")

suspend fun <T> ValueAnimator.awaitAnimation(onValueChanged: (T) -> Unit) {

    suspendCancellableCoroutine { continuation ->

        addListener(

            object : AnimatorListenerAdapter() {

                override fun onAnimationEnd(animation: Animator) = continuation.resumeIfCan(Unit)



                override fun onAnimationCancel(animation: Animator) = continuation.resumeIfCan(Unit)

            }

        )

        addUpdateListener { onValueChanged(it.animatedValue as T) }



        start()

        continuation.invokeOnCancellation { cancel() }

    }

}



private fun <T> CancellableContinuation<T>.resumeIfCan(value: T) {

    if (!isCancelled && !isCompleted) {

        resume(value)

    }

}