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

Commit 5e84b17a authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Correct clock AnimationState initialization 

Bug: 243942947
Test: atest KeyguardClockSwitchControllerTest
Change-Id: Ifddce1f49c5509618bb6bc67ec9e28017b0bc924
parent 67eab634

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

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

        dozeFraction: Float,

        foldFraction: Float,

        foldFraction: Float,

    ) : ClockAnimations {

    ) : ClockAnimations {

        private var foldState = AnimationState(0f)

        private val dozeState = AnimationState(dozeFraction)

        private var dozeState = AnimationState(0f)

        private val foldState = AnimationState(foldFraction)





        init {

        init {

            dozeState = AnimationState(dozeFraction)

            foldState = AnimationState(foldFraction)



            if (foldState.isActive) {

            if (foldState.isActive) {

                clocks.forEach { it.animateFoldAppear(false) }

                clocks.forEach { it.animateFoldAppear(false) }

            } else {

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

    private class AnimationState(

        var fraction: Float,

        var fraction: Float,

    ) {

    ) {

        var isActive: Boolean = fraction < 0.5f

        var isActive: Boolean = fraction > 0.5f

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

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

            if (newFraction == fraction) {

            if (newFraction == fraction) {

                return Pair(isActive, false)

                return Pair(isActive, false)