commit 37960d3377baa4062db069991b28d007edd30b9d
author Catherine Liang <cathliang@google.com> Thu Feb 02 20:21:37 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 02 20:21:37 2023 +0000
tree ec0c531cd01d803c756a48d8fa90173f6e504b03
parent 8e1144edec0c4a7fd4ade622d43889ce12de2bbb
parent 23e1e3fcb8b92e5b874af5aa36ffd8178536ad94

Merge "Color Picker Fragment Preview (1/2)" into tm-qpr-dev

src/com/android/customization/model/color/ColorProvider.kt

diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt
index fbe840e..f91ec6b 100644
--- a/src/com/android/customization/model/color/ColorProvider.kt
+++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -293,7 +293,9 @@
 
                     if (
                         style == Style.MONOCHROMATIC &&
-                            !InjectorProvider.getInjector().getFlags().isMonochromaticFlagEnabled()
+                            !InjectorProvider.getInjector()
+                                .getFlags()
+                                .isMonochromaticThemeEnabled(mContext)
                     ) {
                         continue
                     }

tests/robotests/src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragmentTest.kt

diff --git a/tests/robotests/src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragmentTest.kt b/tests/robotests/src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragmentTest.kt
index 430dd27..3a31a47 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragmentTest.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragmentTest.kt
@@ -6,9 +6,9 @@
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.android.systemui.plugins.ClockId
 import com.android.systemui.plugins.ClockMetadata
 import com.android.systemui.plugins.ClockProvider
+import com.android.systemui.plugins.ClockSettings
 import com.android.systemui.plugins.PluginManager
 import com.android.systemui.shared.clocks.ClockRegistry
 import org.junit.Assert
@@ -33,7 +33,7 @@
     @Mock private lateinit var mockHandler: Handler
     @Mock private lateinit var defaultClockProvider: ClockProvider
 
-    private var settingValue: String = ""
+    private var settingValue: ClockSettings? = null
 
     @Before
     fun setUp() {
@@ -52,7 +52,7 @@
                     userHandle = UserHandle.USER_ALL,
                     defaultClockProvider = defaultClockProvider
                 ) {
-                override var currentClockId: ClockId
+                override var settings: ClockSettings?
                     get() = settingValue
                     set(value) {
                         settingValue = value
@@ -91,6 +91,6 @@
             .findViewHolderForAdapterPosition(testPosition)
             ?.itemView
             ?.performClick()
-        Assert.assertEquals("CLOCK_1", settingValue)
+        Assert.assertEquals("CLOCK_1", settingValue?.clockId)
     }
 }