commit 226de32cdab05beac988ae809699c285f6603b32
author Tim Zimmermann <tim@linux4.de> Fri Oct 06 21:19:49 2023 +0200
committer Tim Zimmermann <tim@linux4.de> Fri Oct 06 21:19:54 2023 +0200
tree 350a24a883600cd821abe34a586549e4b5758ca9
parent 5ff8505633edc7bf125f7016d2bb38db83abad53

ThemePickerLeaf: Update for U

Change-Id: I24a5f34661ffe31e5d06176760c555c44ee74c8d

res_override/layout/themed_icon_section_view.xml

diff --git a/res_override/layout/themed_icon_section_view.xml b/res_override/layout/themed_icon_section_view.xml
index 90c21ba..b6e745b 100644
--- a/res_override/layout/themed_icon_section_view.xml
+++ b/res_override/layout/themed_icon_section_view.xml
@@ -22,7 +22,7 @@
     android:clickable="true"
     android:orientation="vertical"
     android:paddingHorizontal="@dimen/section_horizontal_padding"
-    android:paddingVertical="@dimen/section_vertical_padding">
+    android:paddingVertical="@dimen/section_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

src/org/leafos/customization/module/LeafCustomizationSections.java

diff --git a/src/org/leafos/customization/module/LeafCustomizationSections.java b/src/org/leafos/customization/module/LeafCustomizationSections.java
index 073d0af..eaeb955 100644
--- a/src/org/leafos/customization/module/LeafCustomizationSections.java
+++ b/src/org/leafos/customization/module/LeafCustomizationSections.java
@@ -15,6 +15,7 @@
  */
 package org.leafos.customization.module;
 
+import android.app.WallpaperManager;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -41,7 +42,7 @@
 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.viewmodel.WallpaperQuickSwitchViewModel;
+import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationPickerViewModel;
 import com.android.wallpaper.util.DisplayUtils;
 
 import java.util.List;
@@ -74,14 +75,16 @@
             @Nullable Bundle savedInstanceState,
             CurrentWallpaperInfoFactory wallpaperInfoFactory,
             DisplayUtils displayUtils,
-            WallpaperQuickSwitchViewModel wallpaperQuickSwitchViewModel,
-            WallpaperInteractor wallpaperInteractor) {
+            CustomizationPickerViewModel customizationPickerViewModel,
+            WallpaperInteractor wallpaperInteractor,
+            WallpaperManager wallpaperManager,
+            boolean isTwoPaneAndSmallWidth) {
         List<CustomizationSectionController<?>> sections = mDefaultCustomizationSections
                 .getRevampedUISectionControllersForScreen(screen, activity, lifecycleOwner,
                         wallpaperColorsViewModel, permissionRequester, wallpaperPreviewNavigator,
                         sectionNavigationController, savedInstanceState, wallpaperInfoFactory,
-                        displayUtils, wallpaperQuickSwitchViewModel,
-                        wallpaperInteractor);
+                        displayUtils, customizationPickerViewModel,
+                        wallpaperInteractor, wallpaperManager, isTwoPaneAndSmallWidth);
 
         // Icon pack selection section.
         sections.add(new IconPackSectionController(