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

Commit 83fdd584 authored by Sherry Zhou's avatar Sherry Zhou Committed by Android (Google) Code Review
Browse files

Merge "Fix metro clock animation triggers twice when going to AOD" into main

parents c602f23e efd4d6fe

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+3 −1
Original line number Diff line number Diff line
@@ -544,7 +544,9 @@ constructor( 
                        step.copy(value = 1f - step.value)

                    },

                    keyguardTransitionInteractor.lockscreenToAodTransition,

                )

                ).filter {

                    it.transitionState != TransitionState.FINISHED

                }

                .collect { handleDoze(it.value) }

        }

    }

packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -330,7 +330,8 @@ class ClockEventControllerTest : SysuiTestCase() { 
                TransitionStep(

                    from = KeyguardState.LOCKSCREEN,

                    to = KeyguardState.AOD,

                    value = 0.4f

                    value = 0.4f,

                    transitionState = TransitionState.RUNNING,

                )

            yield()