commit e8fba85019d716a58cb7c97acd6e6d3562523c9f
author George Lin <giolin@google.com> Tue Aug 29 21:53:06 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 29 21:53:06 2023 +0000
tree e6df65f32299eff726f806852986d9fbe6792f43
parent 3c3b39563058809c350db173c968c2f09d85945c
parent b71bc988a575d41cfecfb9f151b25b44d85829bb

Merge "Rename Preview2 to Preview (2/3)" into udc-qpr-dev am: 10dae39f4e am: b71bc988a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/24551243

Change-Id: Ie1f9de5478ddaae99cbb88043bdc4cfb5427e5d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index 1486884..d891686 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -81,9 +81,9 @@
 import com.android.wallpaper.module.UserEventLogger
 import com.android.wallpaper.module.WallpaperPicker2Injector
 import com.android.wallpaper.picker.CustomizationPickerActivity
-import com.android.wallpaper.picker.ImagePreviewFragment2
-import com.android.wallpaper.picker.LivePreviewFragment2
-import com.android.wallpaper.picker.PreviewFragment2
+import com.android.wallpaper.picker.ImagePreviewFragment
+import com.android.wallpaper.picker.LivePreviewFragment
+import com.android.wallpaper.picker.PreviewFragment
 import com.android.wallpaper.picker.customization.data.content.WallpaperClientImpl
 import com.android.wallpaper.picker.customization.data.repository.WallpaperRepository
 import com.android.wallpaper.picker.customization.domain.interactor.WallpaperInteractor
@@ -182,16 +182,16 @@
         testingModeEnabled: Boolean,
         isAssetIdPresent: Boolean
     ): Fragment {
-        return if (wallpaperInfo is LiveWallpaperInfo) LivePreviewFragment2()
+        return if (wallpaperInfo is LiveWallpaperInfo) LivePreviewFragment()
         else
-            ImagePreviewFragment2().apply {
+            ImagePreviewFragment().apply {
                 arguments =
                     Bundle().apply {
-                        putParcelable(PreviewFragment2.ARG_WALLPAPER, wallpaperInfo)
-                        putInt(PreviewFragment2.ARG_PREVIEW_MODE, mode)
-                        putBoolean(PreviewFragment2.ARG_VIEW_AS_HOME, viewAsHome)
-                        putBoolean(PreviewFragment2.ARG_FULL_SCREEN, viewFullScreen)
-                        putBoolean(PreviewFragment2.ARG_TESTING_MODE_ENABLED, testingModeEnabled)
+                        putParcelable(PreviewFragment.ARG_WALLPAPER, wallpaperInfo)
+                        putInt(PreviewFragment.ARG_PREVIEW_MODE, mode)
+                        putBoolean(PreviewFragment.ARG_VIEW_AS_HOME, viewAsHome)
+                        putBoolean(PreviewFragment.ARG_FULL_SCREEN, viewFullScreen)
+                        putBoolean(PreviewFragment.ARG_TESTING_MODE_ENABLED, testingModeEnabled)
                     }
             }
     }