commit ec4c8caa0908c9838cc9e4c43a3a83576e623e2b
author Santiago Etchebehere <santie@google.com> Wed Apr 24 17:17:13 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 24 17:17:13 2024 +0000
tree 81c235a4a18e92fee91e286797b65b024b9ee9d8
parent 7275715308a7d8dfb9373ce177ea1c1402ca205e
parent 71dc359ebbd95f9d8a3ed3145c2d6f677f602112

Merge "Remove getToolbarColorId" into main

src_override/com/android/wallpaper/module/AppModule.kt

diff --git a/src_override/com/android/wallpaper/module/AppModule.kt b/src_override/com/android/wallpaper/module/AppModule.kt
index 3524151..8de80d6 100644
--- a/src_override/com/android/wallpaper/module/AppModule.kt
+++ b/src_override/com/android/wallpaper/module/AppModule.kt
@@ -26,8 +26,6 @@
 import com.android.wallpaper.module.logging.UserEventLogger
 import com.android.wallpaper.picker.preview.data.util.DefaultLiveWallpaperDownloader
 import com.android.wallpaper.picker.preview.data.util.LiveWallpaperDownloader
-import com.android.wallpaper.system.UiModeManagerImpl
-import com.android.wallpaper.system.UiModeManagerWrapper
 import com.android.wallpaper.util.converter.DefaultWallpaperModelFactory
 import com.android.wallpaper.util.converter.WallpaperModelFactory
 import dagger.Binds
@@ -63,8 +61,6 @@
         impl: DefaultLiveWallpaperDownloader
     ): LiveWallpaperDownloader
 
-    @Binds @Singleton abstract fun bindUiModeManager(impl: UiModeManagerImpl): UiModeManagerWrapper
-
     companion object {
         @Provides
         @Singleton

tests/module/src/com/android/customization/TestModule.kt

diff --git a/tests/module/src/com/android/customization/TestModule.kt b/tests/module/src/com/android/customization/TestModule.kt
index d48671b..4600434 100644
--- a/tests/module/src/com/android/customization/TestModule.kt
+++ b/tests/module/src/com/android/customization/TestModule.kt
@@ -16,8 +16,6 @@
 import com.android.wallpaper.module.logging.UserEventLogger
 import com.android.wallpaper.picker.preview.data.util.DefaultLiveWallpaperDownloader
 import com.android.wallpaper.picker.preview.data.util.LiveWallpaperDownloader
-import com.android.wallpaper.system.UiModeManagerWrapper
-import com.android.wallpaper.testing.FakeUiModeManager
 import com.android.wallpaper.testing.TestInjector
 import com.android.wallpaper.testing.TestWallpaperPreferences
 import com.android.wallpaper.util.converter.DefaultWallpaperModelFactory
@@ -80,8 +78,6 @@
         impl: DefaultLiveWallpaperDownloader
     ): LiveWallpaperDownloader
 
-    @Binds @Singleton abstract fun bindUiModeManager(impl: FakeUiModeManager): UiModeManagerWrapper
-
     companion object {
         @Provides
         @Singleton