Remove transit clock flag
Test: N/A
Bug: 287268101
Flag: NONE Cleanup
Change-Id: Ibea9a1e29e3beb5003693b9ceb3376c1c3341570
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
index 9b725eb..954155d 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
@@ -88,7 +88,6 @@
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 @@
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
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt
index 9d62e38..8721c78 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt
@@ -182,9 +182,6 @@
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"
/** Flag denoting adding apply button to wallpaper picker's grid preview page. */
diff --git a/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java b/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java
index 781f6dd..831543d 100644
--- a/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java
+++ b/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java
@@ -74,7 +74,6 @@
clockBuffers,
/* keepAllLoaded = */ false,
/* subTag = */ "System",
- /* isTransitClockEnabled = */ featureFlags.isEnabled(Flags.TRANSIT_CLOCK),
new ThreadAssert());
registry.registerListeners();
return registry;
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index 8990505..e5f3a57 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -152,9 +152,6 @@
// 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
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt
index 31236a4..0682d87 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt
@@ -433,10 +433,6 @@
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)
),
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
index 150f53d..022825a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt
@@ -22,8 +22,6 @@
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase
-import com.android.systemui.flags.FakeFeatureFlags
-import com.android.systemui.flags.Flags.TRANSIT_CLOCK
import com.android.systemui.plugins.clocks.ClockController
import com.android.systemui.plugins.clocks.ClockId
import com.android.systemui.plugins.clocks.ClockMessageBuffers
@@ -76,7 +74,6 @@
private lateinit var pluginListener: PluginListener<ClockProviderPlugin>
private lateinit var registry: ClockRegistry
private lateinit var pickerConfig: ClockPickerConfig
- private val featureFlags = FakeFeatureFlags()
companion object {
private fun failFactory(clockId: ClockId): ClockController {
@@ -532,44 +529,4 @@
val actual = ClockSettings.serialize(ClockSettings("ID", null))
assertEquals(expected, actual)
}
-
- @Test
- fun testTransitClockEnabled_hasTransitClock() {
- testTransitClockFlag(true)
- }
-
- @Test
- fun testTransitClockDisabled_noTransitClock() {
- testTransitClockFlag(false)
- }
-
- private fun testTransitClockFlag(flag: Boolean) {
- featureFlags.set(TRANSIT_CLOCK, flag)
- registry.isTransitClockEnabled = featureFlags.isEnabled(TRANSIT_CLOCK)
- val plugin = FakeClockPlugin()
- .addClock("clock_1")
- .addClock("DIGITAL_CLOCK_METRO")
- val lifecycle = FakeLifecycle("metro", plugin)
- pluginListener.onPluginLoaded(plugin, mockContext, lifecycle)
-
- val list = registry.getClocks()
- if (flag) {
- assertEquals(
- setOf(
- ClockMetadata(DEFAULT_CLOCK_ID),
- ClockMetadata("clock_1"),
- ClockMetadata("DIGITAL_CLOCK_METRO")
- ),
- list.toSet()
- )
- } else {
- assertEquals(
- setOf(
- ClockMetadata(DEFAULT_CLOCK_ID),
- ClockMetadata("clock_1")
- ),
- list.toSet()
- )
- }
- }
}