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

Commit 50f1dee1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11200327 from a149d581 to 24Q1-release 

Change-Id: I2288103b71189ce50967e2898d7be984ba276cfe
parents e28cebc6 a149d581

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

+7 −6
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 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 com.android.wallpaper.util.converter.WallpaperModelFactory

import dagger.Binds

import dagger.Module

import dagger.Provides
@@ -46,6 +47,12 @@ abstract class AppModule { 
    @Singleton

    abstract fun bindThemesUserEventLogger(impl: ThemesUserEventLoggerImpl): ThemesUserEventLogger



    @Binds

    @Singleton

    abstract fun bindWallpaperModelFactory(

        impl: DefaultWallpaperModelFactory

    ): WallpaperModelFactory



    companion object {

        @Provides

        @Singleton
@@ -55,12 +62,6 @@ abstract class AppModule { 
            return DefaultCustomizationPreferences(context)

        }



        @Provides

        @Singleton

        fun provideDefaultWallpaperModelFactory(): DefaultWallpaperModelFactory {

            return DefaultWallpaperModelFactory()

        }



        @Provides

        @Singleton

        fun provideColorCustomizationManager(

tests/module/src/com/android/customization/TestModule.kt

+7 −6
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 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 com.android.wallpaper.util.converter.WallpaperModelFactory

import dagger.Binds

import dagger.Module

import dagger.Provides
@@ -63,13 +64,13 @@ abstract class TestModule { 
        impl: TestDefaultCustomizationPreferences

    ): CustomizationPreferences



    companion object {

        @Provides

    @Binds

    @Singleton

        fun provideDefaultWallpaperModelFactory(): DefaultWallpaperModelFactory {

            return DefaultWallpaperModelFactory()

        }

    abstract fun bindWallpaperModelFactory(

        impl: DefaultWallpaperModelFactory

    ): WallpaperModelFactory



    companion object {

        @Provides

        @Singleton

        fun provideColorCustomizationManager(): ColorCustomizationManager {