Merge "[2] Integrate onDevice wallpaper into main page carousel" into main (fd561569) · Commits · e / os / android_packages_apps_ThemePicker

src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -51,11 +51,13 @@ import com.android.wallpaper.picker.category.domain.interactor.CategoriesLoading
		import com.android.wallpaper.picker.category.domain.interactor.CategoryInteractor
		import com.android.wallpaper.picker.category.domain.interactor.CreativeCategoryInteractor
		import com.android.wallpaper.picker.category.domain.interactor.CuratedPhotosInteractor
		import com.android.wallpaper.picker.category.domain.interactor.OnDeviceWallpapersInteractor
		import com.android.wallpaper.picker.category.domain.interactor.ThirdPartyCategoryInteractor
		import com.android.wallpaper.picker.category.domain.interactor.implementations.CategoryInteractorImpl
		import com.android.wallpaper.picker.category.domain.interactor.implementations.CreativeCategoryInteractorImpl
		import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultCategoriesLoadingStatusInteractor
		import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultCuratedPhotosInteractorImpl
		import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultOnDeviceWallpapersInteractor
		import com.android.wallpaper.picker.category.domain.interactor.implementations.ThirdPartyCategoryInteractorImpl
		import com.android.wallpaper.picker.category.ui.view.providers.IndividualPickerFactory
		import com.android.wallpaper.picker.category.ui.view.providers.implementation.DefaultIndividualPickerFactory
		@@ -139,6 +141,12 @@ abstract class ThemePickerAppModule {
		@Singleton
		abstract fun bindGoogleCategoryInteractor(impl: CategoryInteractorImpl): CategoryInteractor

		@Binds
		@Singleton
		abstract fun bindOnDeviceWallpapersInteractor(
		impl: DefaultOnDeviceWallpapersInteractor
		): OnDeviceWallpapersInteractor

		@Binds
		@Singleton
		abstract fun bindImageEffectDialogUtil(

tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import com.android.wallpaper.modules.ThemePickerAppModule
		import com.android.wallpaper.network.Requester
		import com.android.wallpaper.picker.category.domain.interactor.CategoryInteractor
		import com.android.wallpaper.picker.category.domain.interactor.CuratedPhotosInteractor
		import com.android.wallpaper.picker.category.domain.interactor.OnDeviceWallpapersInteractor
		import com.android.wallpaper.picker.category.domain.interactor.ThirdPartyCategoryInteractor
		import com.android.wallpaper.picker.category.ui.view.providers.IndividualPickerFactory
		import com.android.wallpaper.picker.category.ui.view.providers.implementation.DefaultIndividualPickerFactory
		@@ -67,6 +68,7 @@ import com.android.wallpaper.picker.preview.ui.util.ImageEffectDialogUtil
		import com.android.wallpaper.testing.FakeCategoryInteractor
		import com.android.wallpaper.testing.FakeCuratedPhotosInteractorImpl
		import com.android.wallpaper.testing.FakeDefaultRequester
		import com.android.wallpaper.testing.FakeOnDeviceWallpapersInteractor
		import com.android.wallpaper.testing.FakeThirdPartyCategoryInteractor
		import com.android.wallpaper.testing.FakeWallpaperCategoryWrapper
		import com.android.wallpaper.testing.TestPartnerProvider
		@@ -154,6 +156,12 @@ abstract class ThemePickerTestModule {

		@Binds @Singleton abstract fun bindInjector(impl: TestCustomizationInjector): Injector

		@Binds
		@Singleton
		abstract fun bindOnDeviceWallpapersInteractor(
		impl: FakeOnDeviceWallpapersInteractor
		): OnDeviceWallpapersInteractor

		@Binds
		@Singleton
		abstract fun providePartnerProvider(impl: TestPartnerProvider): PartnerProvider