For #12025 Set Search Shortcuts Off By Default

mozilla-mobile · Jun 26, 2020 · 7a6b5a5 · 7a6b5a5
1 parent d81aa62
commit 7a6b5a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -314,7 +314,7 @@ class Settings private constructor(
 
     val shouldShowSearchShortcuts by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_show_search_shortcuts),
-        default = true
+        default = false
     )
 
     val shouldUseDarkTheme by booleanPreference(

diff --git a/app/src/test/java/org/mozilla/fenix/search/DefaultSearchControllerTest.kt b/app/src/test/java/org/mozilla/fenix/search/DefaultSearchControllerTest.kt
@@ -158,6 +158,10 @@ class DefaultSearchControllerTest {
     @Test
     fun `show search shortcuts when setting enabled AND query empty`() {
         val text = ""
+        testContext.settings().preferences
+            .edit()
+            .putBoolean(testContext.getString(R.string.pref_key_show_search_shortcuts), false)
+            .apply()
 
         controller.handleTextChanged(text)
 
@@ -168,6 +172,10 @@ class DefaultSearchControllerTest {
     fun `show search shortcuts when setting enabled AND query equals url`() {
         val text = "mozilla.org"
         every { session?.url } returns "mozilla.org"
+        testContext.settings().preferences
+            .edit()
+            .putBoolean(testContext.getString(R.string.pref_key_show_search_shortcuts), true)
+            .apply()
 
         assertEquals(text, session?.url)