commit 956d9c26eba313529b0af48830b3569d0f44be9a
author Ale Nijamkin <nijamkin@google.com> Fri Feb 10 23:20:29 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 10 23:20:29 2023 +0000
tree 359994b2428bddacf402cdbede4080b36f56bf1b
parent 6e17da6ec7d15c40fb5884e16e7b75e8d4f46e2c
parent a7603e9945364112f6ff5ef067f35b0241c2d2df

Merge "[TP] Preview click opens wallpaper selector [2/3]." into tm-qpr-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 487bca8..5fb23cf 100644
--- a/src/com/android/customization/module/DefaultCustomizationSections.java
+++ b/src/com/android/customization/module/DefaultCustomizationSections.java
@@ -118,14 +118,16 @@
                         displayUtils,
                         mClockRegistryProvider,
                         mClockCarouselViewModelProvider,
-                        mClockViewFactoryProvider)
+                        mClockViewFactoryProvider,
+                        sectionNavigationController)
                         : new ScreenPreviewSectionController(
                                 activity,
                                 lifecycleOwner,
                                 screen,
                                 wallpaperInfoFactory,
                                 wallpaperColorsViewModel,
-                                displayUtils));
+                                displayUtils,
+                                sectionNavigationController));
 
         sectionControllers.add(
                 new ConnectedSectionController(

src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt

diff --git a/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt b/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
index 6522d84..186611e 100644
--- a/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
+++ b/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
@@ -30,6 +30,7 @@
 import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewModel
 import com.android.systemui.shared.clocks.ClockRegistry
 import com.android.wallpaper.R
+import com.android.wallpaper.model.CustomizationSectionController
 import com.android.wallpaper.model.WallpaperColorsViewModel
 import com.android.wallpaper.module.CurrentWallpaperInfoFactory
 import com.android.wallpaper.module.CustomizationSections
@@ -44,15 +45,16 @@
 /** Controls the screen preview section. */
 @OptIn(ExperimentalCoroutinesApi::class)
 class PreviewWithClockCarouselSectionController(
-    private val activity: Activity,
+    activity: Activity,
     private val lifecycleOwner: LifecycleOwner,
     private val initialScreen: CustomizationSections.Screen,
-    private val wallpaperInfoFactory: CurrentWallpaperInfoFactory,
-    private val colorViewModel: WallpaperColorsViewModel,
-    private val displayUtils: DisplayUtils,
+    wallpaperInfoFactory: CurrentWallpaperInfoFactory,
+    colorViewModel: WallpaperColorsViewModel,
+    displayUtils: DisplayUtils,
     private val clockRegistryProvider: ClockRegistryProvider,
     private val clockCarouselViewModelProvider: ClockCarouselViewModelProvider,
     private val clockViewFactoryProvider: ClockViewFactoryProvider,
+    navigator: CustomizationSectionController.CustomizationSectionNavigationController,
 ) :
     ScreenPreviewSectionController(
         activity,
@@ -61,6 +63,7 @@
         wallpaperInfoFactory,
         colorViewModel,
         displayUtils,
+        navigator,
     ) {
     private var clockCarouselBinding: ClockCarouselViewBinder.Binding? = null
     override fun createView(context: Context): ScreenPreviewView {