Dan Ballard pushed to branch tor-browser-153.2.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: b14a6e22 by clairehurst at 2026-09-03T12:53:37-07:00 TB 45269 [android]: Completely disable search suggestion feature - - - - - 420a1811 by clairehurst at 2026-09-03T12:53:37-07:00 fixup! TB 44653 [android]: Disable 'Allow search suggestions in private sessions' prompt presented in RR 148 android TB 45269 [android]: Completely disable search suggestion feature. Note to rebaser: After squashing this commit into "TB 44653 [android]: Disable 'Allow search suggestions in private sessions' prompt presented in RR 148 android", I think that it would make sense to then squash that commit into TB 45269 [android]: Completely disable search suggestion feature - - - - - 3 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt ===================================== @@ -69,10 +69,6 @@ class SearchEngineFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm initialiseVoiceSearchPreference(showVoiceSearchPreference) updateDefaultSearchEnginePreference() - val searchSuggestionsPreference = - requirePreference<SwitchPreferenceCompat>(R.string.pref_key_show_search_suggestions).apply { - isChecked = context.components.settings.shouldShowSearchSuggestions - } val searchWidgetPreference = requirePreference<SwitchPreferenceCompat>(R.string.pref_key_search_widget_installed_2).apply { @@ -101,7 +97,6 @@ class SearchEngineFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm return false } } - searchSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater() showBookmarkSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater() showClipboardSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater() autocompleteURLsPreference.onPreferenceChangeListener = SharedPreferenceUpdater() ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -1674,10 +1674,7 @@ class Settings( fun incrementShowLoginsSecureWarningSyncCount() = loginsSecureWarningSyncCount.increment() - val shouldShowSearchSuggestions by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions), - default = false, - ) + val shouldShowSearchSuggestions = false val shouldAutocompleteInAwesomebar by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_enable_autocomplete_urls), @@ -1689,28 +1686,27 @@ class Settings( default = false, ) - var shouldShowSearchSuggestionsInPrivate by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions_in_private), - default = true, - ) + var shouldShowSearchSuggestionsInPrivate + get() = false + set(value) {} /** * Indicates if the user have enabled trending search in search suggestions. */ - internal var trendingSearchSuggestionsEnabled by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_show_trending_search_suggestions), - default = false, - ) + internal var trendingSearchSuggestionsEnabled + get() = false + set(value) {} /** * Indicates if the user have enabled recent search in the search suggestions setting preference. */ - internal var shouldShowRecentSearchSuggestions by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_show_recent_search_suggestions), - default = false, - ) + internal var shouldShowRecentSearchSuggestions + get() = false + set(value) {} - var showSearchSuggestionsInPrivateOnboardingFinished = false + var showSearchSuggestionsInPrivateOnboardingFinished + get() = false + set(value) {} fun incrementVisitedInstallableCount() = pwaInstallableVisitCount.increment() ===================================== mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml ===================================== @@ -24,18 +24,6 @@ android:title="@string/preferences_add_search_widget_from_settings"/> </PreferenceCategory> - <PreferenceCategory - android:title="@string/preferences_search_engines_suggestions" - android:selectable="false" - app:iconSpaceReserved="false" - android:layout="@layout/preference_category_no_icon_style"> - <SwitchPreferenceCompat - app:iconSpaceReserved="false" - android:defaultValue="true" - android:key="@string/pref_key_show_search_suggestions" - android:title="@string/preferences_show_search_suggestions" /> - </PreferenceCategory> - <PreferenceCategory android:title="@string/preferences_settings_address_bar" android:selectable="false" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8d218fc... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8d218fc... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help