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

Commit b379943c authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Remove Step Clock Animation Flag 

Test: Manual
Bug: 318736596
Flag: NONE Flag Removal
Change-Id: I4f15cd974323f6368d5a0e3c31e0490d32d04679
parent 44102648

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

+2 −4
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ class DefaultClockController( 
    private val layoutInflater: LayoutInflater,

    private val resources: Resources,

    private val settings: ClockSettings?,

    private val hasStepClockAnimation: Boolean = false,

    private val migratedClocks: Boolean = false,

    messageBuffers: ClockMessageBuffers? = null,

) : ClockController {
@@ -197,12 +196,11 @@ class DefaultClockController( 
                views[0].id =

                    resources.getIdentifier("lockscreen_clock_view_large", "id", ctx.packageName)

            }

        override val config =

            ClockFaceConfig(hasCustomPositionUpdatedAnimation = hasStepClockAnimation)

        override val config = ClockFaceConfig(hasCustomPositionUpdatedAnimation = true)



        init {

            view.migratedClocks = migratedClocks

            view.hasCustomPositionUpdatedAnimation = hasStepClockAnimation

            view.hasCustomPositionUpdatedAnimation = true

            animations = LargeClockAnimations(view, 0f, 0f)

        }

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockProvider.kt

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ class DefaultClockProvider( 
    val ctx: Context,

    val layoutInflater: LayoutInflater,

    val resources: Resources,

    private val hasStepClockAnimation: Boolean = false,

    private val migratedClocks: Boolean = false,

    private val isClockReactiveVariantsEnabled: Boolean = false,

) : ClockProvider {
@@ -75,7 +74,6 @@ class DefaultClockProvider( 
                layoutInflater,

                resources,

                settings,

                hasStepClockAnimation,

                migratedClocks,

                messageBuffers,

            )

packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ public abstract class ClockRegistryModule { 
                        context,

                        layoutInflater,

                        resources,

                        featureFlags.isEnabled(Flags.STEP_CLOCK_ANIMATION),

                        MigrateClocksToBlueprint.isEnabled(),

                        com.android.systemui.Flags.clockReactiveVariants()

                ),

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −6
Original line number Diff line number Diff line
@@ -77,12 +77,6 @@ object Flags { 
    val LOCKSCREEN_CUSTOM_CLOCKS =

        resourceBooleanFlag(R.bool.config_enableLockScreenCustomClocks, "lockscreen_custom_clocks")



    /**

     * Whether the clock on a wide lock screen should use the new "stepping" animation for moving

     * the digits when the clock moves.

     */

    @JvmField val STEP_CLOCK_ANIMATION = releasedFlag("step_clock_animation")



    /**

     * Migration from the legacy isDozing/dozeAmount paths to the new KeyguardTransitionRepository

     * will occur in stages. This is one stage of many to come.