From 4d85ec9bf82c2201f5630681e2fe3a53cc48cd21 Mon Sep 17 00:00:00 2001
From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com>
Date: Tue, 9 Jul 2024 20:28:18 +0800
Subject: [PATCH] Cleanup debug menu

---
 .../algorithms/LawnchairSearchAlgorithm.kt    |  4 +---
 .../destinations/DebugMenuPreferences.kt      | 19 ++++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/lawnchair/src/app/lawnchair/search/algorithms/LawnchairSearchAlgorithm.kt b/lawnchair/src/app/lawnchair/search/algorithms/LawnchairSearchAlgorithm.kt
index 4556de1c03..2bdfb726fb 100644
--- a/lawnchair/src/app/lawnchair/search/algorithms/LawnchairSearchAlgorithm.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/LawnchairSearchAlgorithm.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import app.lawnchair.LawnchairApp
 import app.lawnchair.allapps.views.SearchItemBackground
 import app.lawnchair.allapps.views.SearchResultView.Companion.EXTRA_QUICK_LAUNCH
-import app.lawnchair.preferences.PreferenceManager
 import app.lawnchair.preferences2.PreferenceManager2
 import app.lawnchair.search.LawnchairSearchAdapterProvider
 import app.lawnchair.search.adapter.SearchAdapterItem
@@ -169,12 +168,11 @@ sealed class LawnchairSearchAlgorithm(
             if (!Utilities.ATLEAST_S) return false
             if (!LawnchairApp.isRecentsEnabled) return false
 
-            val prefs = PreferenceManager.getInstance(context)
             if (!ranCompatibilityCheck) {
                 ranCompatibilityCheck = true
                 LawnchairASISearchAlgorithm.checkSearchCompatibility(context)
             }
-            return prefs.deviceSearch.get()
+            return true
         }
 
         fun create(context: Context): LawnchairSearchAlgorithm {
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt
index ce19055943..2bb34d5417 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt
@@ -38,13 +38,13 @@ fun DebugMenuPreferences(
     val enableDebug = prefs.enableDebugMenu.getAdapter()
 
     PreferenceLayout(
-        label = "Debug Menu",
+        label = "Debug menu",
         modifier = modifier,
     ) {
-        MainSwitchPreference(adapter = enableDebug, label = "Show Debug Menu") {
+        MainSwitchPreference(adapter = enableDebug, label = "Show debug menu") {
             PreferenceGroup {
                 ClickablePreference(
-                    label = "Feature Flags",
+                    label = "Feature flags",
                     onClick = {
                         Intent(context, SettingsActivity::class.java)
                             .putExtra(
@@ -55,12 +55,12 @@ fun DebugMenuPreferences(
                     },
                 )
                 ClickablePreference(
-                    label = "Crash Launcher",
+                    label = "Crash launcher",
                     onClick = { throw RuntimeException("User triggered crash") },
                 )
             }
 
-            PreferenceGroup(heading = "Debug Flags") {
+            PreferenceGroup(heading = "Debug flags") {
                 flags2.forEach {
                     SwitchPreference(
                         adapter = it.getAdapter(),
@@ -91,11 +91,4 @@ private val PreferenceManager2.textFlags: List<Preference<String, String, Prefer
     get() = listOf(additionalFonts)
 
 private val PreferenceManager.debugFlags
-    get() = listOf(
-        deviceSearch,
-        searchResultShortcuts,
-        searchResultPeople,
-        searchResultPixelTips,
-        searchResultSettings,
-        ignoreFeedWhitelist,
-    )
+    get() = listOf(ignoreFeedWhitelist)