commit d2e03d927d97b2b67c0e7b6b60cf092397aa2a90
author Marcelo Arteiro <arteiro@google.com> Fri May 03 15:03:05 2024 +0000
committer Marcelo Arteiro <arteiro@google.com> Tue May 21 11:36:45 2024 +0000
tree 53cbfa25053c9fe4f5dbf8506b0fd0cacd9f3147
parent aea650e53f53802eb8f4b7b11c4613d2ab762b16

Moving Server dependencies to frameworks/libs

This requires some migration form kotlin to java which affected
other classes using ColorScheme

Bug: 335429258
Test: Manual
Flag: NONE not applicable
Change-Id: I835fb816acb4d018ca4dba400f30975d7b1a3d62

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

diff --git a/src/com/android/customization/model/color/ThemedWallpaperColorResources.kt b/src/com/android/customization/model/color/ThemedWallpaperColorResources.kt
index 7c89953..c426f9d 100644
--- a/src/com/android/customization/model/color/ThemedWallpaperColorResources.kt
+++ b/src/com/android/customization/model/color/ThemedWallpaperColorResources.kt
@@ -39,11 +39,11 @@
         withContext(Dispatchers.IO) {
             val wallpaperColorScheme =
                 ColorScheme(
-                    wallpaperColors = wallpaperColors,
-                    darkTheme = false,
-                    style = fetchThemeStyleFromSetting(),
+                    wallpaperColors,
+                    false,
+                    fetchThemeStyleFromSetting(),
                 )
-            with(wallpaperColorScheme) {
+            with<ColorScheme, Unit>(wallpaperColorScheme) {
                 addOverlayColor(neutral1, R.color.system_neutral1_10)
                 addOverlayColor(neutral2, R.color.system_neutral2_10)
                 addOverlayColor(accent1, R.color.system_accent1_10)