Merge "Bind floating sheet option item colors (2/2)" into main
diff --git a/res/layout/grid_option2.xml b/res/layout/grid_option2.xml
index 437b95b..c2ba68d 100644
--- a/res/layout/grid_option2.xml
+++ b/res/layout/grid_option2.xml
@@ -34,7 +34,6 @@
android:id="@id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/option_item_background"
android:importantForAccessibility="no" />
<ImageView
diff --git a/res/layout/shape_option2.xml b/res/layout/shape_option2.xml
index 88d5437..fb08336 100644
--- a/res/layout/shape_option2.xml
+++ b/res/layout/shape_option2.xml
@@ -25,7 +25,6 @@
android:id="@id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/option_item_background"
android:importantForAccessibility="no" />
<ImageView
diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
index ba276ae..6b7fa83 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
@@ -55,6 +55,9 @@
private val defaultCustomizationOptionsViewModel =
defaultCustomizationOptionsViewModelFactory.create(viewModelScope)
+ override val wallpaperCarouselViewModel =
+ defaultCustomizationOptionsViewModel.wallpaperCarouselViewModel
+
val clockPickerViewModel = clockPickerViewModelFactory.create(viewModelScope = viewModelScope)
val keyguardQuickAffordancePickerViewModel2 =
keyguardQuickAffordancePickerViewModel2Factory.create(viewModelScope = viewModelScope)