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

Commit 2ffe3092 authored by Florence Yang's avatar Florence Yang Committed by Automerger Merge Worker
Browse files

Merge "Color Change Animation for AnimatableClockView" into tm-qpr-dev am: c023c97f 

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



Change-Id: I28eed66212d4259734227b3589f8ec7f95d61e08
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fa97e64 c023c97f

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt

+24 −0
Original line number Diff line number Diff line
@@ -237,6 +237,28 @@ class AnimatableClockView @JvmOverloads constructor( 
        this.lockScreenColor = lockScreenColor

    }



    fun animateColorChange() {

        logBuffer?.log(tag, DEBUG, "animateColorChange")

        setTextStyle(

            weight = lockScreenWeight,

            textSize = -1f,

            color = null, /* using current color */

            animate = false,

            duration = 0,

            delay = 0,

            onAnimationEnd = null

        )

        setTextStyle(

            weight = lockScreenWeight,

            textSize = -1f,

            color = lockScreenColor,

            animate = true,

            duration = COLOR_ANIM_DURATION,

            delay = 0,

            onAnimationEnd = null

        )

    }



    fun animateAppearOnLockscreen() {

        logBuffer?.log(tag, DEBUG, "animateAppearOnLockscreen")

        setTextStyle(
@@ -350,6 +372,7 @@ class AnimatableClockView @JvmOverloads constructor( 
     *

     * By passing -1 to weight, the view preserves its current weight.

     * By passing -1 to textSize, the view preserves its current text size.

     * By passing null to color, the view preserves its current color.

     *

     * @param weight text weight.

     * @param textSize font size.
@@ -611,6 +634,7 @@ class AnimatableClockView @JvmOverloads constructor( 
        private const val APPEAR_ANIM_DURATION: Long = 350

        private const val CHARGE_ANIM_DURATION_PHASE_0: Long = 500

        private const val CHARGE_ANIM_DURATION_PHASE_1: Long = 1000

        private const val COLOR_ANIM_DURATION: Long = 400



        // Constants for the animation

        private val MOVE_INTERPOLATOR = Interpolators.EMPHASIZED

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ class DefaultClockController( 
            currentColor = color

            view.setColors(DOZE_COLOR, color)

            if (!animations.dozeState.isActive) {

                view.animateAppearOnLockscreen()

                view.animateColorChange()

            }

        }

    }