Merge "Loading animation for landing page screen preview (2/3)" into udc-qpr-dev (147e1a63) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/module/DefaultCustomizationSections.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -122,7 +122,8 @@ public final class DefaultCustomizationSections implements CustomizationSections
		wallpaperInteractor,
		mThemedIconInteractor,
		wallpaperManager,
		isTwoPaneAndSmallWidth)
		isTwoPaneAndSmallWidth,
		savedInstanceState)
		: new PreviewWithThemeSectionController(
		activity,
		lifecycleOwner,
		@@ -134,7 +135,8 @@ public final class DefaultCustomizationSections implements CustomizationSections
		wallpaperInteractor,
		mThemedIconInteractor,
		wallpaperManager,
		isTwoPaneAndSmallWidth));
		isTwoPaneAndSmallWidth,
		savedInstanceState));

		sectionControllers.add(
		new ConnectedSectionController(

+3 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ package com.android.customization.picker.preview.ui.section
		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 @@ class PreviewWithClockCarouselSectionController(
		themedIconInteractor: ThemedIconInteractor,
		wallpaperManager: WallpaperManager,
		private val isTwoPaneAndSmallWidth: Boolean,
		savedInstanceState: Bundle?,
		) :
		PreviewWithThemeSectionController(
		activity,
		@@ -85,6 +87,7 @@ class PreviewWithClockCarouselSectionController(
		themedIconInteractor,
		wallpaperManager,
		isTwoPaneAndSmallWidth,
		savedInstanceState,
		) {

		private val viewModel =

+4 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ package com.android.customization.picker.preview.ui.section
		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 @@ open class PreviewWithThemeSectionController(
		private val themedIconInteractor: ThemedIconInteractor,
		wallpaperManager: WallpaperManager,
		isTwoPaneAndSmallWidth: Boolean,
		savedInstanceState: Bundle?,
		) :
		ScreenPreviewSectionController(
		activity,
		@@ -62,7 +64,8 @@ open class PreviewWithThemeSectionController(
		wallpaperPreviewNavigator,
		wallpaperInteractor,
		wallpaperManager,
		isTwoPaneAndSmallWidth
		isTwoPaneAndSmallWidth,
		savedInstanceState,
		) {
		override fun createScreenPreviewViewModel(context: Context): ScreenPreviewViewModel {
		return PreviewWithThemeViewModel(