Commit 4f6ee789 authored by Matthew Finkel's avatar Matthew Finkel Committed by Matthew Finkel
Browse files

Bug 25741 - TBA: Do not save browsing history by default

parent dab36957

mobile/android/app/src/main/res/xml-v11/preferences_search.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


    <CheckBoxPreference android:key="android.not_a_preference.search.search_history.enabled"

                        android:title="@string/pref_history_search_suggestions"

                        android:defaultValue="true"

                        android:defaultValue="false"

                        android:persistent="true" />



</PreferenceScreen>

mobile/android/app/src/main/res/xml/preferences_search.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


    <CheckBoxPreference android:key="android.not_a_preference.search.search_history.enabled"

                        android:title="@string/pref_history_search_suggestions"

                        android:defaultValue="true"

                        android:defaultValue="false"

                        android:persistent="true" />



</PreferenceScreen>

mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ public class BrowserSearch extends HomeFragment 
        super.onResume();



        final SharedPreferences prefs = GeckoSharedPrefs.forApp(getContext());

        mSavedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, true);

        mSavedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, false);



        // Fetch engines if we need to.

        if (mSearchEngines.isEmpty() || !Locale.getDefault().equals(mLastLocale)) {

mobile/android/base/java/org/mozilla/gecko/home/SearchEngineRow.java

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ class SearchEngineRow extends ThemedRelativeLayout { 


        final int recycledSuggestionCount = mSuggestionView.getChildCount();

        final SharedPreferences prefs = GeckoSharedPrefs.forApp(getContext());

        final boolean savedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, true);

        final boolean savedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, false);



        // Remove duplicates of search engine suggestions from saved searches.

        List<String> searchHistorySuggestions = (rawSearchHistorySuggestions != null) ? rawSearchHistorySuggestions : new ArrayList<String>();