From f4bf92034b247cb526f887a8838a4123b2b7a1b7 Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Wed, 18 May 2022 18:43:10 +0700
Subject: [PATCH] Remove enhanced smartspace flag

---
 .../preferences2/PreferenceManager2.kt        |  6 ------
 .../smartspace/SmartspaceViewContainer.kt     | 20 +++++--------------
 .../ui/preferences/DebugMenuPreferences.kt    |  2 +-
 .../android/launcher3/model/WidgetsModel.java |  3 +--
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
index 345dd0dc1f..7a604242f1 100644
--- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
+++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
@@ -258,12 +258,6 @@ class PreferenceManager2(private val context: Context) : PreferenceManager {
         }
     )
 
-    val enableEnhancedSmartspace = preference(
-        key = booleanPreferencesKey("enable_enhanced_smartspace"),
-        defaultValue = true,
-        onSet = { reloadHelper.recreate() }
-    )
-
     val smartspaceAagWidget = preference(
         key = booleanPreferencesKey("enable_smartspace_aag_widget"),
         defaultValue = true
diff --git a/lawnchair/src/app/lawnchair/smartspace/SmartspaceViewContainer.kt b/lawnchair/src/app/lawnchair/smartspace/SmartspaceViewContainer.kt
index 894e0947aa..1fc60a06e8 100644
--- a/lawnchair/src/app/lawnchair/smartspace/SmartspaceViewContainer.kt
+++ b/lawnchair/src/app/lawnchair/smartspace/SmartspaceViewContainer.kt
@@ -1,7 +1,6 @@
 package app.lawnchair.smartspace
 
 import android.content.Context
-import android.content.Intent
 import android.graphics.Rect
 import android.graphics.RectF
 import android.util.AttributeSet
@@ -10,14 +9,12 @@ import android.view.MotionEvent
 import android.view.View
 import android.widget.FrameLayout
 import app.lawnchair.launcher
-import app.lawnchair.preferences2.PreferenceManager2
 import app.lawnchair.ui.preferences.PreferenceActivity
 import app.lawnchair.ui.preferences.Routes
 import com.android.launcher3.CheckLongPressHelper
 import com.android.launcher3.R
 import com.android.launcher3.logging.StatsLogManager
 import com.android.launcher3.views.OptionsPopupView
-import com.patrykmichalik.preferencemanager.firstBlocking
 
 class SmartspaceViewContainer @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, private val previewMode: Boolean = false
@@ -27,25 +24,18 @@ class SmartspaceViewContainer @JvmOverloads constructor(
     private val smartspaceView: View
 
     init {
-        val prefs = PreferenceManager2.getInstance(context)
         val inflater = LayoutInflater.from(context)
-        smartspaceView = if (prefs.enableEnhancedSmartspace.firstBlocking()) {
-            val view = inflater.inflate(R.layout.smartspace_enhanced, this, false) as BcSmartspaceView
-            view.previewMode = previewMode
-            setOnLongClickListener {
-                openOptions()
-                true
-            }
-            view
-        } else {
-            inflater.inflate(R.layout.smartspace_legacy, this, false)
+        smartspaceView = inflater.inflate(R.layout.smartspace_enhanced, this, false) as BcSmartspaceView
+        smartspaceView.previewMode = previewMode
+        smartspaceView.setOnLongClickListener {
+            openOptions()
+            true
         }
         addView(smartspaceView)
     }
 
     private fun openOptions() {
         if (previewMode) return
-        if (!PreferenceManager2.getInstance(context).enableEnhancedSmartspace.firstBlocking()) return
 
         val launcher = context.launcher
         val pos = Rect()
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt
index 72b92781c8..c55dbdc96b 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt
@@ -76,7 +76,7 @@ fun DebugMenuPreferences() {
 }
 
 private val PreferenceManager2.debugFlags: List<Preference<Boolean, Boolean>>
-    get() = listOf(showComponentNames, enableEnhancedSmartspace)
+    get() = listOf(showComponentNames)
 
 private val PreferenceManager2.textFlags: List<Preference<String, String>>
     get() = listOf(additionalFonts)
diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
index 9358273f5b..36f854444a 100644
--- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
+++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java
@@ -42,7 +42,6 @@ import com.android.launcher3.widget.model.WidgetsListBaseEntry;
 import com.android.launcher3.widget.model.WidgetsListContentEntry;
 import com.android.launcher3.widget.model.WidgetsListHeaderEntry;
 import com.android.launcher3.widget.picker.WidgetsDiffReporter;
-import com.patrykmichalik.preferencemanager.PreferenceExtensionsKt;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -284,7 +283,7 @@ public class WidgetsModel {
             if (item.widgetInfo != null) {
                 if ((item.widgetInfo.getWidgetFeatures() & WIDGET_FEATURE_HIDE_FROM_PICKER) != 0) {
                     boolean isSelf = item.componentName.getPackageName().equals(BuildConfig.APPLICATION_ID);
-                    if (!isSelf || !PreferenceExtensionsKt.firstBlocking(prefs.getEnableEnhancedSmartspace())) {
+                    if (!isSelf) {
                         // Widget is hidden from picker
                         return false;
                     }