Revert "[2/n] Let picker refresh preview when user selects a dif..."

Revert submission 24343660-picker-apply-button

Reason for revert: Build break on git_main branch on several targets

Reverted changes: /q/submissionid:24343660-picker-apply-button

Change-Id: I5ea19f6f42a784f3a3b4b2a6ca538bbc443f5a48
Merged-In: I5ea19f6f42a784f3a3b4b2a6ca538bbc443f5a48

5 files changed, 11 insertions, 31 deletions

diff --git a/src/com/android/customization/model/CustomizationManager.java b/src/com/android/customization/model/CustomizationManager.java
index e6d3872c..104cc837 100644
--- a/src/com/android/customization/model/CustomizationManager.java
+++ b/src/com/android/customization/model/CustomizationManager.java
@@ -72,9 +72,6 @@ public interface CustomizationManager<T extends CustomizationOption> {
      */
     void apply(T option, Callback callback);
 
-    /** Preview the given option without committing the change. */
-    default void preview(T option) {}
-
     /**
      * Loads the available options for the type of Customization managed by this class, calling the
      * given callback when done.
diff --git a/src/com/android/customization/model/grid/GridOptionsManager.java b/src/com/android/customization/model/grid/GridOptionsManager.java
index 78dbb5b2..b7ee37fd 100644
--- a/src/com/android/customization/model/grid/GridOptionsManager.java
+++ b/src/com/android/customization/model/grid/GridOptionsManager.java
@@ -99,11 +99,6 @@ public class GridOptionsManager implements CustomizationManager<GridOption> {
     }
 
     @Override
-    public void preview(GridOption option) {
-        mProvider.updateView();
-    }
-
-    @Override
     public void fetchOptions(OptionsFetchedListener<GridOption> callback, boolean reload) {
         sExecutorService.submit(() -> {
             List<GridOption> gridOptions = mProvider.fetch(reload);
diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
index 8f1860ea..4e775c62 100644
--- a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
+++ b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
@@ -117,10 +117,6 @@ public class LauncherGridOptionsProvider {
         mPreviewUtils.renderPreview(bundle, callback);
     }
 
-    void updateView() {
-        mLiveData.postValue(new Object());
-    }
-
     int applyGrid(String name) {
         ContentValues values = new ContentValues();
         values.put("name", name);
diff --git a/src/com/android/customization/model/grid/data/repository/GridRepository.kt b/src/com/android/customization/model/grid/data/repository/GridRepository.kt
index 4f534ccf..9a3be0cc 100644
--- a/src/com/android/customization/model/grid/data/repository/GridRepository.kt
+++ b/src/com/android/customization/model/grid/data/repository/GridRepository.kt
@@ -17,14 +17,12 @@
 
 package com.android.customization.model.grid.data.repository
 
-import android.content.Context
 import androidx.lifecycle.asFlow
 import com.android.customization.model.CustomizationManager
 import com.android.customization.model.grid.GridOption
 import com.android.customization.model.grid.GridOptionsManager
 import com.android.customization.model.grid.shared.model.GridOptionItemModel
 import com.android.customization.model.grid.shared.model.GridOptionItemsModel
-import com.android.wallpaper.config.BaseFlags
 import kotlin.coroutines.resume
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -43,7 +41,6 @@ interface GridRepository {
 }
 
 class GridRepositoryImpl(
-    private val context: Context,
     private val applicationScope: CoroutineScope,
     private val manager: GridOptionsManager,
     private val backgroundDispatcher: CoroutineDispatcher,
@@ -108,22 +105,18 @@ class GridRepositoryImpl(
     private suspend fun onSelected(option: GridOption) {
         withContext(backgroundDispatcher) {
             suspendCancellableCoroutine { continuation ->
-                if (BaseFlags.get().isGridApplyButtonEnabled(context)) {
-                    manager.preview(option)
-                } else {
-                    manager.apply(
-                        option,
-                        object : CustomizationManager.Callback {
-                            override fun onSuccess() {
-                                continuation.resume(true)
-                            }
+                manager.apply(
+                    option,
+                    object : CustomizationManager.Callback {
+                        override fun onSuccess() {
+                            continuation.resume(true)
+                        }
 
-                            override fun onError(throwable: Throwable?) {
-                                continuation.resume(false)
-                            }
-                        },
-                    )
-                }
+                        override fun onError(throwable: Throwable?) {
+                            continuation.resume(false)
+                        }
+                    },
+                )
             }
         }
     }
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index 3dbbca08..653c403c 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -580,7 +580,6 @@ internal constructor(
                     applicationScope = getApplicationCoroutineScope(),
                     repository =
                         GridRepositoryImpl(
-                            context = appContext,
                             applicationScope = getApplicationCoroutineScope(),
                             manager = GridOptionsManager.getInstance(context),
                             backgroundDispatcher = bgDispatcher,