From 0ca108473285761281ebbba4f05fd09088fd3696 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Tue, 17 Sep 2019 13:39:55 -0700
Subject: [PATCH] For #5371: Updates search engine settings string

---
 .../fenix/settings/SearchEngineFragment.kt    |  2 +-
 .../fenix/settings/SettingsFragment.kt        | 10 +---
 app/src/main/res/navigation/nav_graph.xml     |  2 +-
 app/src/main/res/values/preference_keys.xml   |  2 +-
 app/src/main/res/values/strings.xml           |  2 +
 app/src/main/res/xml/preferences.xml          |  4 +-
 .../res/xml/search_engine_preferences.xml     | 49 +++++++++++--------
 7 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
index c0723d06b3dd..7ca54b6b4db5 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SearchEngineFragment.kt
@@ -20,7 +20,7 @@ class SearchEngineFragment : PreferenceFragmentCompat() {
 
     override fun onResume() {
         super.onResume()
-        (activity as AppCompatActivity).title = getString(R.string.preferences_search_engine)
+        (activity as AppCompatActivity).title = getString(R.string.preferences_search)
         (activity as AppCompatActivity).supportActionBar?.show()
 
         val searchSuggestionsPreference =
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index c7ff37ce473d..a72321415f2b 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -49,7 +49,7 @@ import org.mozilla.fenix.R.string.pref_key_make_default_browser
 import org.mozilla.fenix.R.string.pref_key_privacy_link
 import org.mozilla.fenix.R.string.pref_key_rate
 import org.mozilla.fenix.R.string.pref_key_remote_debugging
-import org.mozilla.fenix.R.string.pref_key_search_engine_settings
+import org.mozilla.fenix.R.string.pref_key_search_settings
 import org.mozilla.fenix.R.string.pref_key_sign_in
 import org.mozilla.fenix.R.string.pref_key_site_permissions
 import org.mozilla.fenix.R.string.pref_key_theme
@@ -124,12 +124,6 @@ class SettingsFragment : PreferenceFragmentCompat(), AccountObserver {
             findPreference<DefaultBrowserPreference>(getPreferenceKey(R.string.pref_key_make_default_browser))
         defaultBrowserPreference?.updateSwitch()
 
-        val searchEnginePreference =
-            findPreference<Preference>(getPreferenceKey(R.string.pref_key_search_engine_settings))
-        searchEnginePreference?.summary = context?.let {
-            requireComponents.search.searchEngineManager.getDefaultSearchEngine(it).name
-        }
-
         val trackingProtectionPreference =
             findPreference<Preference>(getPreferenceKey(R.string.pref_key_tracking_protection_settings))
         trackingProtectionPreference?.summary = context?.let {
@@ -158,7 +152,7 @@ class SettingsFragment : PreferenceFragmentCompat(), AccountObserver {
     @Suppress("ComplexMethod", "LongMethod")
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         when (preference.key) {
-            resources.getString(pref_key_search_engine_settings) -> {
+            resources.getString(pref_key_search_settings) -> {
                 navigateToSearchEngineSettings()
             }
             resources.getString(pref_key_tracking_protection_settings) -> {
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 7f0ef039a28d..a4560149404c 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -399,7 +399,7 @@
     <fragment
         android:id="@+id/searchEngineFragment"
         android:name="org.mozilla.fenix.settings.SearchEngineFragment"
-        android:label="@string/preferences_search_engine" />
+        android:label="@string/preferences_search" />
 
     <fragment
         android:id="@+id/turnOnSyncFragment"
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index a335dd1685b2..6dc66ff083a5 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -3,7 +3,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <resources>
     <string name="pref_key_make_default_browser" translatable="false">pref_key_make_default_browser</string>
-    <string name="pref_key_search_engine_settings" translatable="false">pref_key_search_engine_settings</string>
+    <string name="pref_key_search_settings" translatable="false">pref_key_search_settings</string>
     <string name="pref_key_search_engine" translatable="false">pref_key_search_engine</string>
     <string name="pref_key_passwords" translatable="false">pref_key_passwords</string>
     <string name="pref_key_credit_cards_addresses" translatable="false">pref_key_credit_cards_addresses</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b5657abce3b8..fd104d068624 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -117,6 +117,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 settings related to Search -->
+    <string name="preferences_search">Search</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/preferences.xml b/app/src/main/res/xml/preferences.xml
index 9634ccdb7f67..af23cba609e8 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -33,8 +33,8 @@
         app:iconSpaceReserved="false">
         <androidx.preference.Preference
             android:icon="@drawable/ic_search"
-            android:key="@string/pref_key_search_engine_settings"
-            android:title="@string/preferences_search_engine" />
+            android:key="@string/pref_key_search_settings"
+            android:title="@string/preferences_search" />
 
         <androidx.preference.Preference
             android:icon="@drawable/ic_customize"
diff --git a/app/src/main/res/xml/search_engine_preferences.xml b/app/src/main/res/xml/search_engine_preferences.xml
index fe19d544294b..ddb49f4cf94d 100644
--- a/app/src/main/res/xml/search_engine_preferences.xml
+++ b/app/src/main/res/xml/search_engine_preferences.xml
@@ -5,25 +5,32 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <org.mozilla.fenix.settings.RadioSearchEngineListPreference />
-    <SwitchPreference
-        android:defaultValue="true"
-        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_clipboard_suggestions"
-        android:title="@string/preferences_show_clipboard_suggestions"
-        app:iconSpaceReserved="false" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key_search_browsing_history"
-        android:title='@string/preferences_search_browsing_history'
-        app:iconSpaceReserved="false" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key_search_bookmarks"
-        android:title='@string/preferences_search_bookmarks'
-        app:iconSpaceReserved="false" />
+    <PreferenceCategory
+        android:title="@string/preferences_search_engine"
+        android:selectable="false"
+        app:iconSpaceReserved="false">
+        <org.mozilla.fenix.settings.RadioSearchEngineListPreference 
+            android:selectable="false"/>
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key_show_search_suggestions"
+            android:title="@string/preferences_show_search_suggestions"
+            app:iconSpaceReserved="false"
+            app:allowDividerAbove="false"/>
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key_show_clipboard_suggestions"
+            android:title="@string/preferences_show_clipboard_suggestions"
+            app:iconSpaceReserved="false" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key_search_browsing_history"
+            android:title='@string/preferences_search_browsing_history'
+            app:iconSpaceReserved="false" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/pref_key_search_bookmarks"
+            android:title='@string/preferences_search_bookmarks'
+            app:iconSpaceReserved="false" />
+    </PreferenceCategory>
 </PreferenceScreen>