Merge "Do not force reload current wallpaper info every time" into udc-dev (0af99b97) · Commits · e / os / android_packages_apps_ThemePicker

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ class ClockSettingsFragment : AppbarFragment() {
		R.string.lock_screen_preview_provider_authority,
		),
		),
		wallpaperInfoProvider = {
		wallpaperInfoProvider = { forceReload ->
		suspendCancellableCoroutine { continuation ->
		injector
		.getCurrentWallpaperInfoFactory(context)
		@@ -90,7 +90,7 @@ class ClockSettingsFragment : AppbarFragment() {
		null,
		)
		},
		/* forceRefresh= */ true,
		forceReload,
		)
		}
		},

+4 −4

Original line number	Diff line number	Diff line
		@@ -98,13 +98,13 @@ class ColorPickerFragment : AppbarFragment() {
		R.string.lock_screen_preview_provider_authority,
		),
		),
		wallpaperInfoProvider = {
		wallpaperInfoProvider = { forceReload ->
		suspendCancellableCoroutine { continuation ->
		wallpaperInfoFactory.createCurrentWallpaperInfos(
		{ homeWallpaper, lockWallpaper, _ ->
		continuation.resume(lockWallpaper ?: homeWallpaper, null)
		},
		/* forceRefresh= */ true,
		forceReload,
		)
		}
		},
		@@ -133,13 +133,13 @@ class ColorPickerFragment : AppbarFragment() {
		R.string.grid_control_metadata_name,
		),
		),
		wallpaperInfoProvider = {
		wallpaperInfoProvider = { forceReload ->
		suspendCancellableCoroutine { continuation ->
		wallpaperInfoFactory.createCurrentWallpaperInfos(
		{ homeWallpaper, lockWallpaper, _ ->
		continuation.resume(homeWallpaper ?: lockWallpaper, null)
		},
		/* forceRefresh= */ true,
		forceReload,
		)
		}
		},

+2 −2

Original line number	Diff line number	Diff line
		@@ -91,13 +91,13 @@ private constructor(
		)
		}
		},
		wallpaperInfoProvider = {
		wallpaperInfoProvider = { forceReload ->
		suspendCancellableCoroutine { continuation ->
		wallpaperInfoFactory.createCurrentWallpaperInfos(
		{ homeWallpaper, lockWallpaper, _ ->
		continuation.resume(lockWallpaper ?: homeWallpaper, null)
		},
		/* forceRefresh= */ true,
		forceReload,
		)
		}
		},