Merge "Make ChipAnimatorAdapter check dot state when setting endstate" into sc-dev am: 9a0152a05a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14774821 Change-Id: I5b6367d0b38207c4946104c02c645a36b6f8e726
2021-06-03 06:34:42 +00:00
parent 0d1d7ee78e 9a0152a05a
commit f1d066f1f5
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?) {