commit 1cde12bc1cbcf06f540529ce4e8687a5cc0df63b
author Chris Poultney <poultney@google.com> Mon Apr 17 02:43:23 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 17 02:43:23 2023 +0000
tree be3f494bc3b872663a067ea14407f84b268ccc62
parent f355b44186b04bfad9ba7c45783ae3f610a92f2e
parent a9822af5059745f1026b5fb40b910967b791dfd7

Merge "Keeps picker quick pick correct when switching home/lock tabs (2/3)" into udc-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 786db54..9636bef 100644
--- a/src/com/android/customization/module/DefaultCustomizationSections.java
+++ b/src/com/android/customization/module/DefaultCustomizationSections.java
@@ -40,7 +40,7 @@
 import com.android.wallpaper.picker.customization.ui.section.ConnectedSectionController;
 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.picker.customization.ui.viewmodel.CustomizationPickerViewModel;
 import com.android.wallpaper.util.DisplayUtils;
 
 import java.util.ArrayList;
@@ -98,7 +98,7 @@
             @Nullable Bundle savedInstanceState,
             CurrentWallpaperInfoFactory wallpaperInfoFactory,
             DisplayUtils displayUtils,
-            WallpaperQuickSwitchViewModel wallpaperQuickSwitchViewModel,
+            CustomizationPickerViewModel customizationPickerViewModel,
             WallpaperInteractor wallpaperInteractor) {
         List<CustomizationSectionController<?>> sectionControllers = new ArrayList<>();
 
@@ -140,7 +140,8 @@
                         // Wallpaper quick switch section.
                         new WallpaperQuickSwitchSectionController(
                                 screen,
-                                wallpaperQuickSwitchViewModel,
+                                customizationPickerViewModel.getWallpaperQuickSwitchViewModel(
+                                        screen),
                                 lifecycleOwner,
                                 sectionNavigationController),
                         /* reverseOrderWhenHorizontal= */ true));