Commit ad6aee04 authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

TB 45269 [android]: Completely disable search suggestion feature

parent e766fb7d

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt

+0 −5
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -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

+10 −16
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt: 10 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -1671,10 +1671,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),
@@ -1686,26 +1683,23 @@ 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

        get() = false

mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml

+0 −12
Changes for mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml: 0 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -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"