Snap for 10573083 from 498ba14b649834c400cfeb2d52f35cdbfd771242 to udc-qpr1-release (efdd93b6) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/model/color/ColorProvider.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package com.android.customization.model.color

		import android.app.WallpaperColors
		import android.app.WallpaperManager
		import android.content.Context
		import android.content.res.ColorStateList
		import android.content.res.Resources
		@@ -38,7 +39,6 @@ import com.android.customization.picker.color.shared.model.ColorType
		import com.android.systemui.monet.ColorScheme
		import com.android.systemui.monet.Style
		import com.android.wallpaper.R
		import com.android.wallpaper.compat.WallpaperManagerCompat
		import com.android.wallpaper.module.InjectorProvider
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.Dispatchers
		@@ -130,9 +130,9 @@ class ColorProvider(private val context: Context, stubPackageName: String) :
		private fun isLockScreenWallpaperLastApplied(): Boolean {
		// The WallpaperId increases every time a new wallpaper is set, so the larger wallpaper id
		// is the most recently set wallpaper
		val manager = InjectorProvider.getInjector().getWallpaperManagerCompat(mContext)
		return manager.getWallpaperId(WallpaperManagerCompat.FLAG_LOCK) >
		manager.getWallpaperId(WallpaperManagerCompat.FLAG_SYSTEM)
		val manager = WallpaperManager.getInstance(mContext)
		return manager.getWallpaperId(WallpaperManager.FLAG_LOCK) >
		manager.getWallpaperId(WallpaperManager.FLAG_SYSTEM)
		}

		private fun loadSeedColors(

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ public final class DefaultCustomizationSections implements CustomizationSections
		mThemedIconInteractor,
		wallpaperManager,
		isTwoPaneAndSmallWidth,
		savedInstanceState)
		customizationPickerViewModel)
		: new PreviewWithThemeSectionController(
		activity,
		lifecycleOwner,
		@@ -136,7 +136,7 @@ public final class DefaultCustomizationSections implements CustomizationSections
		mThemedIconInteractor,
		wallpaperManager,
		isTwoPaneAndSmallWidth,
		savedInstanceState));
		customizationPickerViewModel));

		sectionControllers.add(
		new ConnectedSectionController(

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ 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
		@@ -50,6 +49,7 @@ import com.android.wallpaper.picker.customization.domain.interactor.WallpaperInt
		import com.android.wallpaper.picker.customization.ui.section.ScreenPreviewClickView
		import com.android.wallpaper.picker.customization.ui.section.ScreenPreviewSectionController
		import com.android.wallpaper.picker.customization.ui.section.ScreenPreviewView
		import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationPickerViewModel
		import com.android.wallpaper.util.DisplayUtils
		import kotlinx.coroutines.Job
		import kotlinx.coroutines.launch
		@@ -73,7 +73,7 @@ class PreviewWithClockCarouselSectionController(
		themedIconInteractor: ThemedIconInteractor,
		wallpaperManager: WallpaperManager,
		private val isTwoPaneAndSmallWidth: Boolean,
		savedInstanceState: Bundle?,
		customizationPickerViewModel: CustomizationPickerViewModel,
		) :
		PreviewWithThemeSectionController(
		activity,
		@@ -87,7 +87,7 @@ class PreviewWithClockCarouselSectionController(
		themedIconInteractor,
		wallpaperManager,
		isTwoPaneAndSmallWidth,
		savedInstanceState,
		customizationPickerViewModel,
		) {

		private val viewModel =

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ 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
		@@ -31,6 +30,7 @@ import com.android.wallpaper.module.CurrentWallpaperInfoFactory
		import com.android.wallpaper.module.CustomizationSections
		import com.android.wallpaper.picker.customization.domain.interactor.WallpaperInteractor
		import com.android.wallpaper.picker.customization.ui.section.ScreenPreviewSectionController
		import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationPickerViewModel
		import com.android.wallpaper.picker.customization.ui.viewmodel.ScreenPreviewViewModel
		import com.android.wallpaper.util.DisplayUtils
		import com.android.wallpaper.util.PreviewUtils
		@@ -52,7 +52,7 @@ open class PreviewWithThemeSectionController(
		private val themedIconInteractor: ThemedIconInteractor,
		wallpaperManager: WallpaperManager,
		isTwoPaneAndSmallWidth: Boolean,
		savedInstanceState: Bundle?,
		customizationPickerViewModel: CustomizationPickerViewModel,
		) :
		ScreenPreviewSectionController(
		activity,
		@@ -65,7 +65,7 @@ open class PreviewWithThemeSectionController(
		wallpaperInteractor,
		wallpaperManager,
		isTwoPaneAndSmallWidth,
		savedInstanceState,
		customizationPickerViewModel,
		) {
		override fun createScreenPreviewViewModel(context: Context): ScreenPreviewViewModel {
		return PreviewWithThemeViewModel(