Merge "Added dependencies in ThemePicker for packagenotifier" into main
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index a022d00..ae412ed 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -66,6 +66,7 @@
import com.android.wallpaper.module.CustomizationSections
import com.android.wallpaper.module.FragmentFactory
import com.android.wallpaper.module.NetworkStatusNotifier
+import com.android.wallpaper.module.PackageStatusNotifier
import com.android.wallpaper.module.PartnerProvider
import com.android.wallpaper.module.WallpaperPicker2Injector
import com.android.wallpaper.module.WallpaperPreferences
@@ -118,6 +119,7 @@
prefs: Lazy<WallpaperPreferences>,
wallpaperColorsRepository: Lazy<WallpaperColorsRepository>,
defaultWallpaperCategoryWrapper: Lazy<WallpaperCategoryWrapper>,
+ packageNotifier: Lazy<PackageStatusNotifier>,
) :
WallpaperPicker2Injector(
mainScope,
@@ -132,6 +134,7 @@
prefs,
wallpaperColorsRepository,
defaultWallpaperCategoryWrapper,
+ packageNotifier,
),
CustomizationInjector {
private var customizationSections: CustomizationSections? = null
diff --git a/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt b/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt
index a550119..a474212 100644
--- a/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt
+++ b/tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt
@@ -24,6 +24,7 @@
import com.android.wallpaper.picker.customization.domain.interactor.WallpaperInteractor
import com.android.wallpaper.testing.FakeWallpaperClient
import com.android.wallpaper.testing.TestInjector
+import com.android.wallpaper.testing.TestPackageStatusNotifier
import com.android.wallpaper.util.DisplayUtils
import javax.inject.Inject
import javax.inject.Singleton
@@ -42,6 +43,7 @@
injectedWallpaperInteractor: WallpaperInteractor,
prefs: WallpaperPreferences,
private val fakeWallpaperCategoryWrapper: WallpaperCategoryWrapper,
+ private val testStatusNotifier: TestPackageStatusNotifier,
) :
TestInjector(
themesUserEventLogger,
@@ -53,6 +55,7 @@
injectedWallpaperInteractor,
prefs,
fakeWallpaperCategoryWrapper,
+ testStatusNotifier,
),
CustomizationInjector {
/////////////////
diff --git a/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt b/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
index 94af717..bc03f12 100644
--- a/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
+++ b/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
@@ -45,7 +45,10 @@
import com.android.wallpaper.module.logging.UserEventLogger
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.ThirdPartyCategoryInteractor
+import com.android.wallpaper.picker.category.ui.view.providers.IndividualPickerFactory
+import com.android.wallpaper.picker.category.ui.view.providers.implementation.DefaultIndividualPickerFactory
import com.android.wallpaper.picker.category.wrapper.WallpaperCategoryWrapper
import com.android.wallpaper.picker.common.preview.ui.binder.ThemePickerWorkspaceCallbackBinder
import com.android.wallpaper.picker.common.preview.ui.binder.WorkspaceCallbackBinder
@@ -56,6 +59,7 @@
import com.android.wallpaper.picker.di.modules.MainDispatcher
import com.android.wallpaper.picker.preview.ui.util.DefaultImageEffectDialogUtil
import com.android.wallpaper.picker.preview.ui.util.ImageEffectDialogUtil
+import com.android.wallpaper.testing.FakeCategoryInteractor
import com.android.wallpaper.testing.FakeDefaultRequester
import com.android.wallpaper.testing.FakeThirdPartyCategoryInteractor
import com.android.wallpaper.testing.FakeWallpaperCategoryWrapper
@@ -116,6 +120,16 @@
impl: DefaultImageEffectDialogUtil
): ImageEffectDialogUtil
+ @Binds
+ @Singleton
+ abstract fun bindIndividualPickerFactoryFragment(
+ impl: DefaultIndividualPickerFactory
+ ): IndividualPickerFactory
+
+ @Binds
+ @Singleton
+ abstract fun bindCategoryInteractor(impl: FakeCategoryInteractor): CategoryInteractor
+
@Binds @Singleton abstract fun bindInjector(impl: TestCustomizationInjector): Injector
@Binds
diff --git a/tests/robotests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt b/tests/robotests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt
index 63c27ed..36a723c 100644
--- a/tests/robotests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt
+++ b/tests/robotests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt
@@ -46,6 +46,7 @@
import com.android.wallpaper.testing.FakeWallpaperClient
import com.android.wallpaper.testing.TestCurrentWallpaperInfoFactory
import com.android.wallpaper.testing.TestInjector
+import com.android.wallpaper.testing.TestPackageStatusNotifier
import com.android.wallpaper.testing.TestWallpaperPreferences
import com.android.wallpaper.testing.collectLastValue
import com.android.wallpaper.util.DisplayUtils
@@ -80,6 +81,7 @@
private lateinit var client: FakeCustomizationProviderClient
private lateinit var quickAffordanceInteractor: KeyguardQuickAffordancePickerInteractor
private lateinit var wallpaperInteractor: WallpaperInteractor
+ private lateinit var testPackageStatusNotifier: TestPackageStatusNotifier
@Before
fun setUp() {
@@ -109,6 +111,7 @@
backgroundDispatcher = testDispatcher,
)
)
+ testPackageStatusNotifier = TestPackageStatusNotifier()
InjectorProvider.setInjector(
TestInjector(
logger,
@@ -120,6 +123,7 @@
wallpaperInteractor,
mock(WallpaperPreferences::class.java),
mock(WallpaperCategoryWrapper::class.java),
+ testPackageStatusNotifier,
)
)
underTest =