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

Commit 88b44c39 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Fix animation mismatch between privacy chip and persistent dot" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24385753



Change-Id: I6ce0e882690e600b2a755ed9db785bebb407b739
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d4c050f ec2ab0dd

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

+2 −4
Original line number Diff line number Diff line
@@ -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