Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6d1335e authored by Bhavuk Jain's avatar Bhavuk Jain
Browse files

Added dependencies in ThemePicker for packagenotifier 

This CL aims at adding dependencies in ThemePicker for package notifier.
It would make sure that the 3p category listeners work as intended.

Bug: 377163380
Flag: com.android.wallpaper.refactor_wallpaper_category_flag
Test: Tested by building & installing picker on local and checking if
everything WAI

Change-Id: Ide8d92d2466a993af041de3a62d25b375f5b4dd7
parent e1ed5fa8

src/com/android/customization/module/ThemePickerInjector.kt

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import com.android.wallpaper.config.BaseFlags 
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 @@ constructor( 
    prefs: Lazy<WallpaperPreferences>,

    wallpaperColorsRepository: Lazy<WallpaperColorsRepository>,

    defaultWallpaperCategoryWrapper: Lazy<WallpaperCategoryWrapper>,

    packageNotifier: Lazy<PackageStatusNotifier>,

) :

    WallpaperPicker2Injector(

        mainScope,
@@ -132,6 +134,7 @@ constructor( 
        prefs,

        wallpaperColorsRepository,

        defaultWallpaperCategoryWrapper,

        packageNotifier,

    ),

    CustomizationInjector {

    private var customizationSections: CustomizationSections? = null

tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.wallpaper.picker.customization.data.repository.WallpaperColor 
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 @@ constructor( 
    injectedWallpaperInteractor: WallpaperInteractor,

    prefs: WallpaperPreferences,

    private val fakeWallpaperCategoryWrapper: WallpaperCategoryWrapper,

    private val testStatusNotifier: TestPackageStatusNotifier,

) :

    TestInjector(

        themesUserEventLogger,
@@ -53,6 +55,7 @@ constructor( 
        injectedWallpaperInteractor,

        prefs,

        fakeWallpaperCategoryWrapper,

        testStatusNotifier,

    ),

    CustomizationInjector {

    /////////////////

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

+14 −0
Original line number Diff line number Diff line
@@ -45,7 +45,10 @@ import com.android.wallpaper.module.logging.TestUserEventLogger 
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.BackgroundDispatcher 
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 @@ abstract class ThemePickerTestModule { 
        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

tests/robotests/src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.wallpaper.picker.option.ui.viewmodel.OptionItemViewModel 
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 @@ class KeyguardQuickAffordancePickerViewModelTest { 
    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 @@ class KeyguardQuickAffordancePickerViewModelTest { 
                        backgroundDispatcher = testDispatcher,

                    )

            )

        testPackageStatusNotifier = TestPackageStatusNotifier()

        InjectorProvider.setInjector(

            TestInjector(

                logger,
@@ -120,6 +123,7 @@ class KeyguardQuickAffordancePickerViewModelTest { 
                wallpaperInteractor,

                mock(WallpaperPreferences::class.java),

                mock(WallpaperCategoryWrapper::class.java),

                testPackageStatusNotifier,

            )

        )

        underTest =