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

Commit 4b4b57e1 authored by William Xiao's avatar William Xiao Committed by Android (Google) Code Review
Browse files

Merge "Match alternate bouncer animation duration from hub to lock screen's duration" into main

parents 3ebfcbfa 3d7745ca
Loading
Loading
Loading
Loading
+12 −2
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ constructor(
                when (toState) {
                    KeyguardState.LOCKSCREEN -> TO_LOCKSCREEN_DURATION
                    KeyguardState.OCCLUDED -> TO_OCCLUDED_DURATION
                    KeyguardState.ALTERNATE_BOUNCER -> TO_BOUNCER_DURATION
                    KeyguardState.PRIMARY_BOUNCER -> TO_BOUNCER_DURATION
                    else -> DEFAULT_DURATION
                }.inWholeMilliseconds
        }
@@ -269,8 +271,16 @@ constructor(

    companion object {
        const val TAG = "FromGlanceableHubTransitionInteractor"
        val DEFAULT_DURATION = 1.seconds
        val TO_LOCKSCREEN_DURATION = DEFAULT_DURATION

        /**
         * DEFAULT_DURATION controls the timing for all animations other than those with overrides
         * in [getDefaultAnimatorForTransitionsToState].
         *
         * Set at 400ms for parity with [FromLockscreenTransitionInteractor]
         */
        val DEFAULT_DURATION = 400.milliseconds
        val TO_LOCKSCREEN_DURATION = 1.seconds
        val TO_BOUNCER_DURATION = 400.milliseconds
        val TO_OCCLUDED_DURATION = 450.milliseconds
    }
}