Merge changes Ic7998fd4,I83af7b83 into udc-qpr-dev
* changes:
Refactor SysUiStatsLogger
Remove unused context in StatsLogUserEventLogger
diff --git a/src/com/android/customization/module/DefaultCustomizationSections.java b/src/com/android/customization/module/DefaultCustomizationSections.java
index b408a89..04d331e 100644
--- a/src/com/android/customization/module/DefaultCustomizationSections.java
+++ b/src/com/android/customization/module/DefaultCustomizationSections.java
@@ -122,7 +122,8 @@
wallpaperInteractor,
mThemedIconInteractor,
wallpaperManager,
- isTwoPaneAndSmallWidth)
+ isTwoPaneAndSmallWidth,
+ savedInstanceState)
: new PreviewWithThemeSectionController(
activity,
lifecycleOwner,
@@ -134,7 +135,8 @@
wallpaperInteractor,
mThemedIconInteractor,
wallpaperManager,
- isTwoPaneAndSmallWidth));
+ isTwoPaneAndSmallWidth,
+ savedInstanceState));
sectionControllers.add(
new ConnectedSectionController(
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 8e91798..7cf3550 100644
--- a/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
+++ b/src/com/android/customization/picker/preview/ui/section/PreviewWithClockCarouselSectionController.kt
@@ -20,6 +20,7 @@
import android.app.WallpaperManager
import android.content.Context
import android.graphics.Rect
+import android.os.Bundle
import android.view.TouchDelegate
import android.view.View
import android.view.View.OnAttachStateChangeListener
@@ -72,6 +73,7 @@
themedIconInteractor: ThemedIconInteractor,
wallpaperManager: WallpaperManager,
private val isTwoPaneAndSmallWidth: Boolean,
+ savedInstanceState: Bundle?,
) :
PreviewWithThemeSectionController(
activity,
@@ -85,6 +87,7 @@
themedIconInteractor,
wallpaperManager,
isTwoPaneAndSmallWidth,
+ savedInstanceState,
) {
private val viewModel =
diff --git a/src/com/android/customization/picker/preview/ui/section/PreviewWithThemeSectionController.kt b/src/com/android/customization/picker/preview/ui/section/PreviewWithThemeSectionController.kt
index 56c6c30..ba48b53 100644
--- a/src/com/android/customization/picker/preview/ui/section/PreviewWithThemeSectionController.kt
+++ b/src/com/android/customization/picker/preview/ui/section/PreviewWithThemeSectionController.kt
@@ -20,6 +20,7 @@
import android.app.Activity
import android.app.WallpaperManager
import android.content.Context
+import android.os.Bundle
import androidx.lifecycle.LifecycleOwner
import com.android.customization.model.themedicon.domain.interactor.ThemedIconInteractor
import com.android.customization.picker.preview.ui.viewmodel.PreviewWithThemeViewModel
@@ -51,6 +52,7 @@
private val themedIconInteractor: ThemedIconInteractor,
wallpaperManager: WallpaperManager,
isTwoPaneAndSmallWidth: Boolean,
+ savedInstanceState: Bundle?,
) :
ScreenPreviewSectionController(
activity,
@@ -62,7 +64,8 @@
wallpaperPreviewNavigator,
wallpaperInteractor,
wallpaperManager,
- isTwoPaneAndSmallWidth
+ isTwoPaneAndSmallWidth,
+ savedInstanceState,
) {
override fun createScreenPreviewViewModel(context: Context): ScreenPreviewViewModel {
return PreviewWithThemeViewModel(