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
-
420a1811
by clairehurst at 2026-09-03T12:53:37-07:00
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:
| ... | ... | @@ -69,10 +69,6 @@ class SearchEngineFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm |
| 69 | 69 | initialiseVoiceSearchPreference(showVoiceSearchPreference)
|
| 70 | 70 | updateDefaultSearchEnginePreference()
|
| 71 | 71 | |
| 72 | - val searchSuggestionsPreference =
|
|
| 73 | - requirePreference<SwitchPreferenceCompat>(R.string.pref_key_show_search_suggestions).apply {
|
|
| 74 | - isChecked = context.components.settings.shouldShowSearchSuggestions
|
|
| 75 | - }
|
|
| 76 | 72 | |
| 77 | 73 | val searchWidgetPreference =
|
| 78 | 74 | requirePreference<SwitchPreferenceCompat>(R.string.pref_key_search_widget_installed_2).apply {
|
| ... | ... | @@ -101,7 +97,6 @@ class SearchEngineFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFragm |
| 101 | 97 | return false
|
| 102 | 98 | }
|
| 103 | 99 | }
|
| 104 | - searchSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater()
|
|
| 105 | 100 | showBookmarkSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater()
|
| 106 | 101 | showClipboardSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater()
|
| 107 | 102 | autocompleteURLsPreference.onPreferenceChangeListener = SharedPreferenceUpdater()
|
| ... | ... | @@ -1674,10 +1674,7 @@ class Settings( |
| 1674 | 1674 | |
| 1675 | 1675 | fun incrementShowLoginsSecureWarningSyncCount() = loginsSecureWarningSyncCount.increment()
|
| 1676 | 1676 | |
| 1677 | - val shouldShowSearchSuggestions by booleanPreference(
|
|
| 1678 | - appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions),
|
|
| 1679 | - default = false,
|
|
| 1680 | - )
|
|
| 1677 | + val shouldShowSearchSuggestions = false
|
|
| 1681 | 1678 | |
| 1682 | 1679 | val shouldAutocompleteInAwesomebar by booleanPreference(
|
| 1683 | 1680 | appContext.getPreferenceKey(R.string.pref_key_enable_autocomplete_urls),
|
| ... | ... | @@ -1689,28 +1686,27 @@ class Settings( |
| 1689 | 1686 | default = false,
|
| 1690 | 1687 | )
|
| 1691 | 1688 | |
| 1692 | - var shouldShowSearchSuggestionsInPrivate by booleanPreference(
|
|
| 1693 | - appContext.getPreferenceKey(R.string.pref_key_show_search_suggestions_in_private),
|
|
| 1694 | - default = true,
|
|
| 1695 | - )
|
|
| 1689 | + var shouldShowSearchSuggestionsInPrivate
|
|
| 1690 | + get() = false
|
|
| 1691 | + set(value) {}
|
|
| 1696 | 1692 | |
| 1697 | 1693 | /**
|
| 1698 | 1694 | * Indicates if the user have enabled trending search in search suggestions.
|
| 1699 | 1695 | */
|
| 1700 | - internal var trendingSearchSuggestionsEnabled by booleanPreference(
|
|
| 1701 | - appContext.getPreferenceKey(R.string.pref_key_show_trending_search_suggestions),
|
|
| 1702 | - default = false,
|
|
| 1703 | - )
|
|
| 1696 | + internal var trendingSearchSuggestionsEnabled
|
|
| 1697 | + get() = false
|
|
| 1698 | + set(value) {}
|
|
| 1704 | 1699 | |
| 1705 | 1700 | /**
|
| 1706 | 1701 | * Indicates if the user have enabled recent search in the search suggestions setting preference.
|
| 1707 | 1702 | */
|
| 1708 | - internal var shouldShowRecentSearchSuggestions by booleanPreference(
|
|
| 1709 | - appContext.getPreferenceKey(R.string.pref_key_show_recent_search_suggestions),
|
|
| 1710 | - default = false,
|
|
| 1711 | - )
|
|
| 1703 | + internal var shouldShowRecentSearchSuggestions
|
|
| 1704 | + get() = false
|
|
| 1705 | + set(value) {}
|
|
| 1712 | 1706 | |
| 1713 | - var showSearchSuggestionsInPrivateOnboardingFinished = false
|
|
| 1707 | + var showSearchSuggestionsInPrivateOnboardingFinished
|
|
| 1708 | + get() = false
|
|
| 1709 | + set(value) {}
|
|
| 1714 | 1710 | |
| 1715 | 1711 | fun incrementVisitedInstallableCount() = pwaInstallableVisitCount.increment()
|
| 1716 | 1712 |
| ... | ... | @@ -24,18 +24,6 @@ |
| 24 | 24 | android:title="@string/preferences_add_search_widget_from_settings"/>
|
| 25 | 25 | </PreferenceCategory>
|
| 26 | 26 | |
| 27 | - <PreferenceCategory
|
|
| 28 | - android:title="@string/preferences_search_engines_suggestions"
|
|
| 29 | - android:selectable="false"
|
|
| 30 | - app:iconSpaceReserved="false"
|
|
| 31 | - android:layout="@layout/preference_category_no_icon_style">
|
|
| 32 | - <SwitchPreferenceCompat
|
|
| 33 | - app:iconSpaceReserved="false"
|
|
| 34 | - android:defaultValue="true"
|
|
| 35 | - android:key="@string/pref_key_show_search_suggestions"
|
|
| 36 | - android:title="@string/preferences_show_search_suggestions" />
|
|
| 37 | - </PreferenceCategory>
|
|
| 38 | - |
|
| 39 | 27 | <PreferenceCategory
|
| 40 | 28 | android:title="@string/preferences_settings_address_bar"
|
| 41 | 29 | android:selectable="false"
|