commit d606b89c6dc4a0a204713b62e6f46ce0f5dc2c3c
author Johannes Gallmann <gallmann@google.com> Fri Aug 11 09:33:39 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 11 09:33:39 2023 +0000
tree 737ba162f2772088761ca0e43166f40fd6e9a52a
parent 6e13300709cb2998f2a1556476718453662c6fbc
parent 819045661652cbe4088cb2f8cf9dd00a78b210b2

Merge "Fix animation mismatch between privacy chip and persistent dot" into udc-qpr-dev

packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt
index 6e8b8bd..1ad4620 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt
@@ -168,10 +168,8 @@
         }
 
         val keyFrame1Height = dotSize * 2
-        val v = currentAnimatedView!!.view
-        val chipVerticalCenter = v.top + v.measuredHeight / 2
-        val height1 = ValueAnimator.ofInt(
-                currentAnimatedView!!.view.measuredHeight, keyFrame1Height).apply {
+        val chipVerticalCenter = chipBounds.top + chipBounds.height() / 2
+        val height1 = ValueAnimator.ofInt(chipBounds.height(), keyFrame1Height).apply {
             startDelay = 8.frames
             duration = 6.frames
             interpolator = STATUS_CHIP_HEIGHT_TO_DOT_KEYFRAME_1