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

Commit 9211a131 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Correct clock AnimationState initialization" into tm-qpr-dev

parents bbe23b9b 5e84b17a

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

+3 −6
Original line number Diff line number Diff line
@@ -188,13 +188,10 @@ class DefaultClockController( 
        dozeFraction: Float,

        foldFraction: Float,

    ) : ClockAnimations {

        private var foldState = AnimationState(0f)

        private var dozeState = AnimationState(0f)

        private val dozeState = AnimationState(dozeFraction)

        private val foldState = AnimationState(foldFraction)



        init {

            dozeState = AnimationState(dozeFraction)

            foldState = AnimationState(foldFraction)



            if (foldState.isActive) {

                clocks.forEach { it.animateFoldAppear(false) }

            } else {
@@ -235,7 +232,7 @@ class DefaultClockController( 
    private class AnimationState(

        var fraction: Float,

    ) {

        var isActive: Boolean = fraction < 0.5f

        var isActive: Boolean = fraction > 0.5f

        fun update(newFraction: Float): Pair<Boolean, Boolean> {

            if (newFraction == fraction) {

                return Pair(isActive, false)