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

This commit is contained in:
Johannes Gallmann
2023-08-11 09:33:39 +00:00
committed by Android (Google) Code Review

View File

@@ -168,10 +168,8 @@ class SystemEventChipAnimationController @Inject constructor(
}
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