BC25 Preview current wallpapers (2/2)
Get current wallpapers, home and lock, to display. For the case of 2
different static wallpapers, create 2 different static preview view
models. The view models are created lazily so that if the home and
lock share the same wallpaper, then only create one. Crop hints and
colors are yet to be configured.
Flag: com.android.wallpaper.new_picker_ui_flag
Bug: 348462236
Test: manually verified with combinations of static and live wallpapers
Test: unit tests added
Change-Id: Ibb12a232e7c29b8a9c58744cec7f6f83edee10f7
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index a9aa182..dfba2ce 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -22,7 +22,6 @@
import android.content.Intent
import android.content.res.Resources
import android.net.Uri
-import android.text.TextUtils
import androidx.activity.ComponentActivity
import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner
@@ -69,9 +68,7 @@
import com.android.wallpaper.module.FragmentFactory
import com.android.wallpaper.module.WallpaperPicker2Injector
import com.android.wallpaper.picker.CustomizationPickerActivity
-import com.android.wallpaper.picker.customization.data.content.WallpaperClientImpl
import com.android.wallpaper.picker.customization.data.repository.WallpaperColorsRepository
-import com.android.wallpaper.picker.customization.data.repository.WallpaperRepository
import com.android.wallpaper.picker.customization.domain.interactor.WallpaperInteractor
import com.android.wallpaper.picker.di.modules.BackgroundDispatcher
import com.android.wallpaper.picker.di.modules.MainDispatcher
@@ -93,7 +90,6 @@
@BackgroundDispatcher private val bgDispatcher: CoroutineDispatcher,
) : WallpaperPicker2Injector(mainScope, bgDispatcher), CustomizationInjector {
private var customizationSections: CustomizationSections? = null
- private var wallpaperInteractor: WallpaperInteractor? = null
private var keyguardQuickAffordancePickerViewModelFactory:
KeyguardQuickAffordancePickerViewModel.Factory? =
null
@@ -203,33 +199,7 @@
}
override fun getWallpaperInteractor(context: Context): WallpaperInteractor {
- if (getFlags().isMultiCropEnabled()) {
- return injectedWallpaperInteractor.get()
- }
-
- val appContext = context.applicationContext
- return wallpaperInteractor
- ?: WallpaperInteractor(
- repository =
- WallpaperRepository(
- scope = getApplicationCoroutineScope(),
- client =
- WallpaperClientImpl(
- context = appContext,
- wallpaperManager = WallpaperManager.getInstance(appContext),
- wallpaperPreferences = getPreferences(appContext),
- ),
- wallpaperPreferences = getPreferences(context = appContext),
- backgroundDispatcher = bgDispatcher,
- ),
- shouldHandleReload = {
- TextUtils.equals(
- getColorCustomizationManager(appContext).currentColorSource,
- COLOR_SOURCE_PRESET,
- )
- }
- )
- .also { wallpaperInteractor = it }
+ return injectedWallpaperInteractor.get()
}
override fun getKeyguardQuickAffordancePickerInteractor(