Merge "Make ChipAnimatorAdapter check dot state when setting endstate" into sc-dev

2021-06-01 20:15:50 +00:00
parent 0fc93aa28a a335a46cc2
commit 9a0152a05a
1 changed files with 5 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationScheduler.kt
@@ -315,7 +315,11 @@ class SystemStatusAnimationScheduler @Inject constructor(
    ) : AnimatorListenerAdapter() {
        override fun onAnimationEnd(p0: Animator?) {
            chipAnimationController.onChipAnimationEnd(animationState)
-            animationState = endState
+            animationState = if (endState == SHOWING_PERSISTENT_DOT && !hasPersistentDot) {
+                IDLE
+            } else {
+                endState
+            }
        }

        override fun onAnimationStart(p0: Animator?) {