From 53ba8ca814bf64469419db5d2bd973091bc563a7 Mon Sep 17 00:00:00 2001 From: harvey186 Date: Sun, 24 Dec 2023 15:45:58 +0100 Subject: [PATCH] search --- .../java/org/mozilla/fenix/home/HomeMenu.kt | 3 +- .../java/org/mozilla/fenix/utils/Settings.kt | 4 +- .../xml/tracking_protection_preferences.xml | 4 +- automation/iceraven/assets/list.json | 230 +++++++++--------- 4 files changed, 120 insertions(+), 121 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt index e0e8e281..bd938329 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -116,7 +116,6 @@ class HomeMenu( @Suppress("ComplexMethod") private fun coreMenuItems(): List { - val settings = context.components.settings val bookmarksItem = BrowserMenuImageText( context.getString(R.string.library_bookmarks), @@ -228,7 +227,7 @@ class HomeMenu( helpItem, customizeHomeItem, settingsItem, - if (settings.shouldDeleteBrowsingDataOnQuit) quitItem else null, + quitItem, ).also { items -> items.getHighlight()?.let { onHighlightPresent(it) } } diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 21f934d7..49844dd5 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -718,12 +718,12 @@ class Settings(private val appContext: Context) : PreferencesHolder { val useStandardTrackingProtection by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_tracking_protection_standard_option), - true, + false, ) val useStrictTrackingProtection by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_tracking_protection_strict_default), - false, + true, ) val useCustomTrackingProtection by booleanPreference( diff --git a/app/src/main/res/xml/tracking_protection_preferences.xml b/app/src/main/res/xml/tracking_protection_preferences.xml index 186fc889..e95a7189 100644 --- a/app/src/main/res/xml/tracking_protection_preferences.xml +++ b/app/src/main/res/xml/tracking_protection_preferences.xml @@ -16,13 +16,13 @@ android:title="@string/preference_enhanced_tracking_protection" app:iconSpaceReserved="false" />