[TP] Move flag am: dea718c886 am: 4e09a0e744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/21000795
Change-Id: I889dd8f4e5e1ea5f5c5fc0d2a0c7eb54fbca572c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/customization/picker/clock/ui/section/ClockSectionController.kt b/src/com/android/customization/picker/clock/ui/section/ClockSectionController.kt
index 848f226..748fa17 100644
--- a/src/com/android/customization/picker/clock/ui/section/ClockSectionController.kt
+++ b/src/com/android/customization/picker/clock/ui/section/ClockSectionController.kt
@@ -22,24 +22,21 @@
import com.android.customization.picker.clock.ClockSectionView
import com.android.customization.picker.clock.ui.binder.ClockSectionViewBinder
import com.android.customization.picker.clock.ui.viewmodel.ClockSectionViewModel
-import com.android.systemui.shared.customization.data.content.CustomizationProviderClient
-import com.android.systemui.shared.customization.data.content.CustomizationProviderContract as Contract
import com.android.wallpaper.R
+import com.android.wallpaper.config.BaseFlags
import com.android.wallpaper.model.CustomizationSectionController
import com.android.wallpaper.model.CustomizationSectionController.CustomizationSectionNavigationController
-import kotlinx.coroutines.runBlocking
/** A [CustomizationSectionController] for clock customization. */
class ClockSectionController(
private val navigationController: CustomizationSectionNavigationController,
- private val customizationProviderClient: CustomizationProviderClient,
private val viewModel: ClockSectionViewModel,
private val lifecycleOwner: LifecycleOwner,
+ private val flag: BaseFlags,
) : CustomizationSectionController<ClockSectionView?> {
+
override fun isAvailable(context: Context?): Boolean {
- return runBlocking { customizationProviderClient.queryFlags() }
- .firstOrNull { it.name == Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED }
- ?.value == true
+ return flag.isCustomClocksEnabled(context!!)
}
override fun createView(context: Context): ClockSectionView {