From 66c83957a018f3c35dc727a4a9b87b6dc2b12337 Mon Sep 17 00:00:00 2001 From: ottoptj Date: Wed, 20 Nov 2024 02:50:49 +0200 Subject: [PATCH] Further improvements to web search button --- app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt | 5 ----- .../eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt index 7175405..9500eab 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt @@ -568,7 +568,6 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh "searchEnabled" -> { uiUtils.setSearchVisibility(searchView, binding.searchLayout, binding.searchReplacement) - uiUtils.setWebSearchVisibility(internetSearch) } "contactsEnabled" -> { @@ -579,10 +578,6 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh } } - "webSearchEnabled" -> { - uiUtils.setWebSearchVisibility(internetSearch) - } - "clockAlignment" -> { uiUtils.setClockAlignment(clock, dateText) } diff --git a/app/src/main/java/eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt b/app/src/main/java/eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt index c8fd1fa..faa0b73 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt @@ -241,7 +241,7 @@ class SharedPreferenceManager (private val context: Context) { } fun isWebSearchEnabled(): Boolean { - return preferences.getBoolean("webSearchEnabled", false) && isSearchEnabled() + return preferences.getBoolean("webSearchEnabled", false) && isSearchEnabled() && !isAutoLaunchEnabled() } // Hidden Apps