Merge "Adapt all screen previews to recent changes (2/2)" into udc-dev (e4d2f9aa) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/model/grid/ui/fragment/GridFragment2.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -122,10 +122,10 @@ class GridFragment2 : AppbarFragment() {
		}
		},
		wallpaperInteractor = wallpaperInteractor,
		screen = CustomizationSections.Screen.HOME_SCREEN,
		),
		lifecycleOwner = this,
		offsetToStart = false,
		screen = CustomizationSections.Screen.HOME_SCREEN,
		onPreviewDirty = { activity?.recreate() },
		)
		}

src/com/android/customization/module/ThemePickerInjector.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,7 @@ open class ThemePickerInjector : WallpaperPicker2Injector(), CustomizationInject
		?: KeyguardQuickAffordancePickerViewModel.Factory(
		context,
		getKeyguardQuickAffordancePickerInteractor(context),
		getWallpaperInteractor(context),
		getCurrentWallpaperInfoFactory(context),
		) { intent ->
		context.startActivity(intent)

src/com/android/customization/picker/clock/ui/fragment/ClockSettingsFragment.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import com.android.customization.module.ThemePickerInjector
		import com.android.customization.picker.clock.ui.binder.ClockSettingsBinder
		import com.android.systemui.shared.clocks.shared.model.ClockPreviewConstants
		import com.android.wallpaper.R
		import com.android.wallpaper.module.CustomizationSections
		import com.android.wallpaper.module.InjectorProvider
		import com.android.wallpaper.picker.AppbarFragment
		import com.android.wallpaper.picker.customization.ui.binder.ScreenPreviewBinder
		@@ -106,9 +107,12 @@ class ClockSettingsFragment : AppbarFragment() {
		)
		}
		},
		wallpaperInteractor = injector.getWallpaperInteractor(requireContext()),
		screen = CustomizationSections.Screen.LOCK_SCREEN,
		),
		lifecycleOwner = this,
		offsetToStart = displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(activity),
		onPreviewDirty = { activity.recreate() },
		)

		ClockSettingsBinder.bind(

src/com/android/customization/picker/color/ui/fragment/ColorPickerFragment.kt

+7 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import com.android.customization.model.mode.DarkModeSectionController
		import com.android.customization.module.ThemePickerInjector
		import com.android.customization.picker.color.ui.binder.ColorPickerBinder
		import com.android.wallpaper.R
		import com.android.wallpaper.module.CustomizationSections
		import com.android.wallpaper.module.InjectorProvider
		import com.android.wallpaper.picker.AppbarFragment
		import com.android.wallpaper.picker.customization.ui.binder.ScreenPreviewBinder
		@@ -103,10 +104,13 @@ class ColorPickerFragment : AppbarFragment() {
		onWallpaperColorChanged = { colors ->
		wcViewModel.setLockWallpaperColors(colors)
		},
		wallpaperInteractor = injector.getWallpaperInteractor(requireContext()),
		screen = CustomizationSections.Screen.LOCK_SCREEN,
		),
		lifecycleOwner = this,
		offsetToStart =
		displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(requireActivity()),
		onPreviewDirty = { activity?.recreate() },
		)
		ScreenPreviewBinder.bind(
		activity = requireActivity(),
		@@ -135,10 +139,13 @@ class ColorPickerFragment : AppbarFragment() {
		onWallpaperColorChanged = { colors ->
		wcViewModel.setLockWallpaperColors(colors)
		},
		wallpaperInteractor = injector.getWallpaperInteractor(requireContext()),
		screen = CustomizationSections.Screen.HOME_SCREEN,
		),
		lifecycleOwner = this,
		offsetToStart =
		displayUtils.isSingleDisplayOrUnfoldedHorizontalHinge(requireActivity()),
		onPreviewDirty = { activity?.recreate() },
		)
		val darkModeToggleContainerView: FrameLayout =
		view.requireViewById(R.id.dark_mode_toggle_container)

src/com/android/customization/picker/quickaffordance/ui/binder/KeyguardQuickAffordancePreviewBinder.kt

+2 −3

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ object KeyguardQuickAffordancePreviewBinder {
		lifecycleOwner = lifecycleOwner,
		offsetToStart = offsetToStart,
		dimWallpaper = true,
		onPreviewDirty = { activity.recreate() },
		)

		previewView.contentDescription =
		@@ -62,9 +63,7 @@ object KeyguardQuickAffordancePreviewBinder {
		.collect { slotId ->
		binding.sendMessage(
		KeyguardPreviewConstants.MESSAGE_ID_SLOT_SELECTED,
		Bundle().apply {
		putString(KeyguardPreviewConstants.KEY_SLOT_ID, slotId)
		},
		Bundle().apply { putString(KeyguardPreviewConstants.KEY_SLOT_ID, slotId) },
		)
		}
		}