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

Commit 921237f9 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Correct clock AnimationState initialization" into tm-qpr-dev am: 9211a131 

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



Change-Id: I73dd569a3bb4ffeed78da7af7580132f83077371
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5417edb7 9211a131

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)