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

Commit bafc1f5a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove transit clock flag" into main

parents 285f2b88 4b413271

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

+0 −5
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ open class ClockRegistry( 
    val clockBuffers: ClockMessageBuffers? = null,

    val keepAllLoaded: Boolean,

    subTag: String,

    var isTransitClockEnabled: Boolean = false,

    val assert: ThreadAssert = ThreadAssert(),

) {

    private val TAG = "${ClockRegistry::class.simpleName} ($subTag)"
@@ -188,10 +187,6 @@ open class ClockRegistry( 
                var isClockListChanged = false

                for (clock in plugin.getClocks()) {

                    val id = clock.clockId

                    if (!isTransitClockEnabled && id == "DIGITAL_CLOCK_METRO") {

                        continue

                    }



                    val info =

                        availableClocks.concurrentGetOrPut(id, ClockInfo(clock, plugin, manager)) {

                            isClockListChanged = true

packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt

+0 −3
Original line number Diff line number Diff line
@@ -181,9 +181,6 @@ object CustomizationProviderContract { 
        /** Flag denoting AI Wallpapers are enabled in wallpaper picker. */

        const val FLAG_NAME_WALLPAPER_PICKER_UI_FOR_AIWP = "wallpaper_picker_ui_for_aiwp"



        /** Flag denoting transit clock are enabled in wallpaper picker. */

        const val FLAG_NAME_TRANSIT_CLOCK = "lockscreen_custom_transit_clock"



        /** Flag denoting transit clock are enabled in wallpaper picker. */

        const val FLAG_NAME_PAGE_TRANSITIONS = "wallpaper_picker_page_transitions"

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

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

                /* keepAllLoaded = */ false,

                /* subTag = */ "System",

                /* isTransitClockEnabled = */ featureFlags.isEnabled(Flags.TRANSIT_CLOCK),

                new ThreadAssert());

        registry.registerListeners();

        return registry;

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

+0 −3
Original line number Diff line number Diff line
@@ -152,9 +152,6 @@ object Flags { 
    // TODO(b/286563884): Tracking bug

    @JvmField val KEYGUARD_TALKBACK_FIX = unreleasedFlag("keyguard_talkback_fix")



    // TODO(b/287268101): Tracking bug.

    @JvmField val TRANSIT_CLOCK = releasedFlag("lockscreen_custom_transit_clock")



    /** Enables preview loading animation in the wallpaper picker. */

    // TODO(b/274443705): Tracking Bug

    @JvmField

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt

+0 −4
Original line number Diff line number Diff line
@@ -432,10 +432,6 @@ constructor( 
                name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_PICKER_UI_FOR_AIWP,

                value = featureFlags.isEnabled(Flags.WALLPAPER_PICKER_UI_FOR_AIWP)

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_TRANSIT_CLOCK,

                value = featureFlags.isEnabled(Flags.TRANSIT_CLOCK)

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_PAGE_TRANSITIONS,

                value = featureFlags.isEnabled(Flags.WALLPAPER_PICKER_PAGE_TRANSITIONS)