From 676091e0c908bbdf1b3b4027e8c3c27675a4c03d Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 10 Apr 2019 13:25:00 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/1375 - Suppress history
 suggestions in awesome bar via setting

---
 .../org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt | 5 ++++-
 app/src/main/java/org/mozilla/fenix/utils/Settings.kt       | 6 ++++++
 app/src/main/res/values/preference_keys.xml                 | 3 ++-
 app/src/main/res/values/strings.xml                         | 2 ++
 app/src/main/res/xml/search_engine_preferences.xml          | 5 +++++
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
index 7e49bed4e4..d92d5baad5 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
@@ -155,9 +155,12 @@ class AwesomeBarUIView(
             view.addProviders(searchSuggestionProvider!!)
         }
 
+        if (Settings.getInstance(container.context).shouldShowVisitedSitesBookmarks) {
+            view.addProviders(historyStorageProvider!!)
+        }
+
         view.addProviders(
             clipboardSuggestionProvider!!,
-            historyStorageProvider!!,
             sessionProvider!!
         )
     }
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 8e5379b725..95979d9d50 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -61,6 +61,12 @@ class Settings private constructor(context: Context) {
             false
         )
 
+    val shouldShowVisitedSitesBookmarks: Boolean
+        get() = preferences.getBoolean(
+            appContext.getPreferenceKey(R.string.pref_key_show_visited_sites_bookmarks),
+            true
+        )
+
     val shouldUseDarkTheme: Boolean
         get() = preferences.getBoolean(
             appContext.getPreferenceKey(R.string.pref_key_dark_theme),
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 3282e687dc..33805b6b45 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -37,7 +37,8 @@
     <!-- Search Settings -->
     <string name="pref_key_show_search_suggestions" translatable="false">pref_key_show_search_suggestions</string>
 
-    <string name = "pref_key_bounce_quick_action" translatable="false">pref_key_bounce_quick_action</string>
+    <string name="pref_key_bounce_quick_action" translatable="false">pref_key_bounce_quick_action</string>
+    <string name="pref_key_show_visited_sites_bookmarks" translatable="false">pref_key_show_visited_sites_bookmarks</string>
     <!-- Site Permissions Settings -->
     <string name="pref_key_optimize" translatable="false">pref_key_optimize</string>
     <string name="pref_key_show_site_exceptions" translatable="false">pref_key_show_site_exceptions</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 81974a5adb..346404834b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,6 +89,8 @@
     <string name="preferences_category_about">About</string>
     <!-- Preference for settings related to changing the default search engine -->
     <string name="preferences_search_engine">Search engine</string>
+    <!-- Preference for showing visited sites and bookmarks in awesomebar -->
+    <string name="preference_show_visited_sites_bookmarks">Show visited sites and bookmarks</string>
     <!-- Preference linking to help about Fenix -->
     <string name="preferences_help">Help</string>
     <!-- Preference link to rating Fenix on the Play Store -->
diff --git a/app/src/main/res/xml/search_engine_preferences.xml b/app/src/main/res/xml/search_engine_preferences.xml
index 81c01084d9..48edd4f372 100644
--- a/app/src/main/res/xml/search_engine_preferences.xml
+++ b/app/src/main/res/xml/search_engine_preferences.xml
@@ -11,4 +11,9 @@
         android:key="@string/pref_key_show_search_suggestions"
         android:title="@string/preferences_show_search_suggestions"
         app:iconSpaceReserved="false" />
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="@string/pref_key_show_visited_sites_bookmarks"
+        android:title='@string/preference_show_visited_sites_bookmarks'
+        app:iconSpaceReserved="false" />
 </PreferenceScreen>