commit ec0de7e22bc2ced6f21d55273eabc4dab117bc32
author Chris Poultney <poultney@google.com> Mon Apr 17 03:57:30 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 17 03:57:30 2023 +0000
tree 75d56d979fed0e3e80dffd0b0567412aad674f37
parent d61e7131fbc75d812e60e5eff2dcc95beab16194
parent 50ba696a7f841160ec2d1664be70eeaccf5ace6f

Merge "Keeps picker quick pick correct when switching home/lock tabs (2/3)" into udc-dev am: 1cde12bc1c am: 50ba696a7f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/22628998

Change-Id: I18423253a54c30087bcf3813d7700da80b79048c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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));