Merge "Move clock flags to shared lib" into main
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig
index a66ad19..b421e69 100644
--- a/packages/SystemUI/aconfig/systemui.aconfig
+++ b/packages/SystemUI/aconfig/systemui.aconfig
@@ -587,20 +587,6 @@
}
flag {
- name: "clock_reactive_variants"
- namespace: "systemui"
- description: "Add reactive variant fonts to some clocks"
- bug: "343495953"
-}
-
-flag {
- name: "lockscreen_custom_clocks"
- namespace: "systemui"
- description: "Enable lockscreen custom clocks"
- bug: "378486437"
-}
-
-flag {
name: "faster_unlock_transition"
namespace: "systemui"
description: "Faster wallpaper unlock transition"
diff --git a/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java b/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java
index e76f38c..9507b04 100644
--- a/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java
+++ b/packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java
@@ -62,15 +62,14 @@
scope,
mainDispatcher,
bgDispatcher,
- com.android.systemui.Flags.lockscreenCustomClocks()
+ com.android.systemui.shared.Flags.lockscreenCustomClocks()
|| featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),
/* handleAllUsers= */ true,
new DefaultClockProvider(
context,
layoutInflater,
resources,
-
- com.android.systemui.Flags.clockReactiveVariants()
+ com.android.systemui.shared.Flags.clockReactiveVariants()
),
context.getString(R.string.lockscreen_clock_id_fallback),
clockBuffers,
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 de5088c..898b68d 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
@@ -475,7 +475,7 @@
KeyguardPickerFlag(
name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED,
value =
- com.android.systemui.Flags.lockscreenCustomClocks() ||
+ com.android.systemui.shared.Flags.lockscreenCustomClocks() ||
featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),
),
KeyguardPickerFlag(