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

Commit 94aab86d authored by Abdullah Tabassum's avatar Abdullah Tabassum Committed by Android (Google) Code Review
Browse files

Merge "[3] Integrate WallpaperModel into LiveWallpaperClient" into main

parents 66ceb543 863f0061

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

+8 −0
Original line number Diff line number Diff line
@@ -45,9 +45,11 @@ import com.android.wallpaper.effects.EffectsController 
import com.android.wallpaper.module.DefaultExtendedEffectsHelper

import com.android.wallpaper.module.DefaultPartnerProvider

import com.android.wallpaper.module.DefaultRecentWallpaperManager

import com.android.wallpaper.module.DefaultThirdPartyLiveWallpaperModelFactory

import com.android.wallpaper.module.ExtendedEffectsHelper

import com.android.wallpaper.module.PartnerProvider

import com.android.wallpaper.module.RecentWallpaperManager

import com.android.wallpaper.module.ThirdPartyLiveWallpaperModelFactory

import com.android.wallpaper.module.WallpaperPreferences

import com.android.wallpaper.module.logging.UserEventLogger

import com.android.wallpaper.picker.category.domain.interactor.CategoriesLoadingStatusInteractor
@@ -253,6 +255,12 @@ abstract class ThemePickerAppModule { 
        impl: DefaultApplyWallpaperOptionsProvider

    ): ApplyWallpaperOptionsProvider



    @Binds

    @Singleton

    abstract fun bindThirdPartyLiveWallpaperModelFactory(

        impl: DefaultThirdPartyLiveWallpaperModelFactory

    ): ThirdPartyLiveWallpaperModelFactory



    companion object {



        @Provides

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

+8 −0
Original line number Diff line number Diff line
@@ -43,9 +43,11 @@ import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptio 
import com.android.wallpaper.effects.EffectsController

import com.android.wallpaper.effects.FakeEffectsController

import com.android.wallpaper.module.DefaultRecentWallpaperManager

import com.android.wallpaper.module.DefaultThirdPartyLiveWallpaperModelFactory

import com.android.wallpaper.module.Injector

import com.android.wallpaper.module.PartnerProvider

import com.android.wallpaper.module.RecentWallpaperManager

import com.android.wallpaper.module.ThirdPartyLiveWallpaperModelFactory

import com.android.wallpaper.module.WallpaperPreferences

import com.android.wallpaper.module.logging.TestUserEventLogger

import com.android.wallpaper.module.logging.UserEventLogger
@@ -238,6 +240,12 @@ abstract class ThemePickerTestModule { 
        impl: DefaultApplyWallpaperOptionsProvider

    ): ApplyWallpaperOptionsProvider



    @Binds

    @Singleton

    abstract fun bindThirdPartyLiveWallpaperModelFactory(

        impl: DefaultThirdPartyLiveWallpaperModelFactory

    ): ThirdPartyLiveWallpaperModelFactory



    companion object {



        @Provides