commit 113d1dfd611fefa4095b3a3b52f7199340195cfb
author George Lin <giolin@google.com> Mon Feb 03 07:12:53 2025 +0000
committer George Lin <giolin@google.com> Mon Feb 03 07:14:22 2025 +0000
tree 4f408a07dad5bff27bbebe4caa244feafdcf471d
parent c9fa42acc9c41311ef2fd0eaf1a3fc25517f50cc

Remove wallpaper entry from the option list (2/2)

We will add the wallpaper entry as a stand-alone, collapsible component

Test: Manually tested that the wallpaper entry is gone
Bug: 391608923
Flag: com.android.systemui.shared.new_customization_picker_ui
Change-Id: I3acc8b30490ae04e02aec604da8ec851c933b506

src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt

diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
index 307c893..3016299 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
@@ -47,7 +47,6 @@
 import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerHomeCustomizationOption
 import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption
 import com.android.wallpaper.customization.ui.viewmodel.ThemePickerCustomizationOptionsViewModel
-import com.android.wallpaper.model.Screen
 import com.android.wallpaper.picker.common.icon.ui.viewbinder.IconViewBinder
 import com.android.wallpaper.picker.common.text.ui.viewbinder.TextViewBinder
 import com.android.wallpaper.picker.customization.ui.binder.ColorUpdateBinder
@@ -57,7 +56,6 @@
 import com.android.wallpaper.picker.customization.ui.viewmodel.ColorUpdateViewModel
 import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationOptionsViewModel
 import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationPickerViewModel2
-import com.android.wallpaper.picker.data.WallpaperModel
 import com.google.android.material.materialswitch.MaterialSwitch
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -80,11 +78,9 @@
         viewModel: CustomizationPickerViewModel2,
         colorUpdateViewModel: ColorUpdateViewModel,
         lifecycleOwner: LifecycleOwner,
-        navigateToWallpaperCategoriesScreen: (screen: Screen) -> Unit,
         navigateToMoreLockScreenSettingsActivity: () -> Unit,
         navigateToColorContrastSettingsActivity: () -> Unit,
         navigateToLockScreenNotificationsSettingsActivity: () -> Unit,
-        navigateToPreviewScreen: ((wallpaperModel: WallpaperModel) -> Unit)?,
     ) {
         defaultCustomizationOptionsBinder.bind(
             view,
@@ -94,11 +90,9 @@
             viewModel,
             colorUpdateViewModel,
             lifecycleOwner,
-            navigateToWallpaperCategoriesScreen,
             navigateToMoreLockScreenSettingsActivity,
             navigateToColorContrastSettingsActivity,
             navigateToLockScreenNotificationsSettingsActivity,
-            navigateToPreviewScreen,
         )
 
         val isComposeRefactorEnabled = BaseFlags.get().isComposeRefactorEnabled()