commit a2822deab4088f3d150be67b71ee7f7f7741bb47
author Ale Nijamkin <nijamkin@google.com> Tue Jan 10 04:04:02 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 10 04:04:02 2023 +0000
tree 0c8b546d76995a9c5cf90ee7c633c325da5562d4
parent 420390c53bb6ec50ff3856754d5b089244bf97d4
parent b729b81de9194c539e28a84c57e942d3ae7d557d

Merge "Keep wallpaper quick switch order stable (2/3)." into tm-qpr-dev

src/com/android/customization/module/DefaultCustomizationSections.java

diff --git a/src/com/android/customization/module/DefaultCustomizationSections.java b/src/com/android/customization/module/DefaultCustomizationSections.java
index ea071ea..2fb530a 100644
--- a/src/com/android/customization/module/DefaultCustomizationSections.java
+++ b/src/com/android/customization/module/DefaultCustomizationSections.java
@@ -25,16 +25,14 @@
 import com.android.wallpaper.model.WorkspaceViewModel;
 import com.android.wallpaper.module.CurrentWallpaperInfoFactory;
 import com.android.wallpaper.module.CustomizationSections;
-import com.android.wallpaper.picker.customization.domain.interactor.WallpaperInteractor;
 import com.android.wallpaper.picker.customization.ui.section.ScreenPreviewSectionController;
 import com.android.wallpaper.picker.customization.ui.section.WallpaperQuickSwitchSectionController;
+import com.android.wallpaper.picker.customization.ui.viewmodel.WallpaperQuickSwitchViewModel;
 import com.android.wallpaper.util.DisplayUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import kotlinx.coroutines.GlobalScope;
-
 /** {@link CustomizationSections} for the customization picker. */
 public final class DefaultCustomizationSections implements CustomizationSections {
 
@@ -64,7 +62,7 @@
             @Nullable Bundle savedInstanceState,
             CurrentWallpaperInfoFactory wallpaperInfoFactory,
             DisplayUtils displayUtils,
-            WallpaperInteractor wallpaperInteractor) {
+            WallpaperQuickSwitchViewModel wallpaperQuickSwitchViewModel) {
         List<CustomizationSectionController<?>> sectionControllers = new ArrayList<>();
 
         // Wallpaper section.
@@ -84,10 +82,8 @@
         // Wallpaper quick switch section.
         sectionControllers.add(
                 new WallpaperQuickSwitchSectionController(
-                        wallpaperInteractor,
-                        lifecycleOwner,
-                        GlobalScope.INSTANCE,
-                        sectionNavigationController));
+                        wallpaperQuickSwitchViewModel,
+                        lifecycleOwner));
 
         switch (screen) {
             case LOCK_SCREEN: