Merge "Make WallpaperModelFactory injectable (2/3)" into main (889595c4) · Commits · e / os / android_packages_apps_ThemePicker

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import com.android.customization.module.ThemePickerInjector
		import com.android.customization.module.logging.ThemesUserEventLogger
		import com.android.customization.module.logging.ThemesUserEventLoggerImpl
		import com.android.wallpaper.module.logging.UserEventLogger
		import com.android.wallpaper.util.converter.DefaultWallpaperModelFactory
		import dagger.Binds
		import dagger.Module
		import dagger.Provides
		@@ -51,5 +52,11 @@ abstract class AppModule {
		): WallpaperPreferences {
		return DefaultCustomizationPreferences(context)
		}

		@Provides
		@Singleton
		fun provideDefaultWallpaperModelFactory(): DefaultWallpaperModelFactory {
		return DefaultWallpaperModelFactory()
		}
		}
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -13,8 +13,10 @@ import com.android.wallpaper.module.logging.TestUserEventLogger
		import com.android.wallpaper.module.logging.UserEventLogger
		import com.android.wallpaper.testing.TestInjector
		import com.android.wallpaper.testing.TestWallpaperPreferences
		import com.android.wallpaper.util.converter.DefaultWallpaperModelFactory
		import dagger.Binds
		import dagger.Module
		import dagger.Provides
		import dagger.hilt.components.SingletonComponent
		import dagger.hilt.testing.TestInstallIn
		import javax.inject.Singleton
		@@ -57,4 +59,12 @@ abstract class TestModule {
		abstract fun bindCustomizationPrefs(
		impl: TestDefaultCustomizationPreferences
		): CustomizationPreferences

		companion object {
		@Provides
		@Singleton
		fun provideDefaultWallpaperModelFactory(): DefaultWallpaperModelFactory {
		return DefaultWallpaperModelFactory()
		}
		}
		}