commit 1972db87580d502d3307a04f7e0011041f1282b8
author George Lin <giolin@google.com> Mon Dec 11 21:54:00 2023 +0000
committer George Lin <giolin@google.com> Tue Dec 12 15:45:07 2023 +0000
tree e47366cd2da974ecab223015f20b5ad2267d58c1
parent fa36874a30b628218f8b82a9d3256aec06098d0b

Renaming WhichPreview following the camal case (1/3)

Test: Build success
Bug: 315850406
Flag: ACONFIG com.android.wallpaper.multi_crop_preview_ui_flag DEVELOPMENT
Change-Id: Ied4fc31f17ba7e787a2755748369c9a57ac70645

src/com/android/wallpaper/picker/LivePreviewFragment.java

diff --git a/src/com/android/wallpaper/picker/LivePreviewFragment.java b/src/com/android/wallpaper/picker/LivePreviewFragment.java
index 2d7b13b..4c09e6f 100644
--- a/src/com/android/wallpaper/picker/LivePreviewFragment.java
+++ b/src/com/android/wallpaper/picker/LivePreviewFragment.java
@@ -604,8 +604,8 @@
                     mWallpaperSurface,
                     null,
                     mIsViewAsHome ? FLAG_SYSTEM : FLAG_LOCK,
-                    mIsAssetIdPresent ? WallpaperConnection.WHICH_PREVIEW.EDIT_NON_CURRENT
-                            : WallpaperConnection.WHICH_PREVIEW.EDIT_CURRENT);
+                    mIsAssetIdPresent ? WallpaperConnection.WhichPreview.EDIT_NON_CURRENT
+                            : WallpaperConnection.WhichPreview.EDIT_CURRENT);
             mWallpaperConnection.setVisibility(true);
         } else {
             WallpaperColorsLoader.getWallpaperColors(

src/com/android/wallpaper/picker/customization/ui/binder/ScreenPreviewBinder.kt

diff --git a/src/com/android/wallpaper/picker/customization/ui/binder/ScreenPreviewBinder.kt b/src/com/android/wallpaper/picker/customization/ui/binder/ScreenPreviewBinder.kt
index ebb9ec0..46b2c1a 100644
--- a/src/com/android/wallpaper/picker/customization/ui/binder/ScreenPreviewBinder.kt
+++ b/src/com/android/wallpaper/picker/customization/ui/binder/ScreenPreviewBinder.kt
@@ -563,7 +563,7 @@
             wallpaperSurface,
             mirrorSurface,
             screen.toFlag(),
-            WallpaperConnection.WHICH_PREVIEW.PREVIEW_CURRENT
+            WallpaperConnection.WhichPreview.PREVIEW_CURRENT
         )
 
     private fun removeAndReadd(view: View) {

src/com/android/wallpaper/util/WallpaperConnection.java

diff --git a/src/com/android/wallpaper/util/WallpaperConnection.java b/src/com/android/wallpaper/util/WallpaperConnection.java
index ca3febf..d3150bb 100644
--- a/src/com/android/wallpaper/util/WallpaperConnection.java
+++ b/src/com/android/wallpaper/util/WallpaperConnection.java
@@ -62,11 +62,10 @@
 public class WallpaperConnection extends IWallpaperConnection.Stub implements ServiceConnection {
 
     /**
-     * Defines the different possible scenarios for which we need to dispatch a command
-     * from picker to the wallpaper.
+     * Defines different possible scenarios for which we need to dispatch a command from picker to
+     * the wallpaper.
      */
-
-    public enum WHICH_PREVIEW {
+    public enum WhichPreview {
         /**
          * Represents the case when we preview a currently applied wallpaper (home/lock) simply
          * by tapping on it.
@@ -83,7 +82,7 @@
 
         private final int mValue;
 
-        WHICH_PREVIEW(int value) {
+        WhichPreview(int value) {
             this.mValue = value;
         }
 
@@ -120,7 +119,7 @@
     private boolean mEngineReady;
     private boolean mDestroyed;
     private int mDestinationFlag;
-    private WHICH_PREVIEW mWhichPreview;
+    private WhichPreview mWhichPreview;
 
     /**
      * @param intent used to bind the wallpaper service
@@ -130,7 +129,7 @@
      */
     public WallpaperConnection(Intent intent, Context context,
             @Nullable WallpaperConnectionListener listener, @NonNull SurfaceView containerView,
-            WHICH_PREVIEW preview) {
+            WhichPreview preview) {
         this(intent, context, listener, containerView, null, null,
                 preview);
     }
@@ -150,7 +149,7 @@
             @Nullable WallpaperConnectionListener listener, @NonNull SurfaceView containerView,
             @Nullable SurfaceView secondaryContainerView,
             @Nullable @WallpaperManager.SetWallpaperFlags Integer destinationFlag,
-            WHICH_PREVIEW preview) {
+            WhichPreview preview) {
         mContext = context.getApplicationContext();
         mIntent = intent;
         mListener = listener;