commit dea718c88696fcda9eac25f0702532f227b774d4
author George Lin <giolin@google.com> Mon Jan 16 08:16:32 2023 +0000
committer George Lin <giolin@google.com> Thu Jan 19 04:06:32 2023 +0000
tree ce4cc2be760f901ef31b3348ce71dc2d864fa86c
parent 15dab578fa25ba18145363330506fa2ef399b25d

[TP] Move flag

Move the flag to one place for WPP flags.

Test: Manully tested the flag still works as expected
Bug: 265061202
Change-Id: Id759f9a2d39a840d05ccefbfc86b75d324ea7f85

src/com/android/customization/picker/clock/ui/section/ClockSectionController.kt

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 {