diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt index 3c56c0b15..2286fa723 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt @@ -188,7 +188,6 @@ class AwesomeBarView( title = R.string.search_engine_suggestions_title, description = activity.getString(R.string.search_engine_suggestions_description), searchIcon = searchWithBitmap, - suggestionsHeader = getSearchEngineSuggestionsHeader(), ) searchSuggestionProviderMap = HashMap() @@ -319,7 +318,9 @@ class AwesomeBarView( providersToAdd.add(getLocalTabsProvider(state.searchEngineSource, true)) } - providersToAdd.add(searchEngineSuggestionProvider) + if (!activity.settings().showUnifiedSearchFeature) { + providersToAdd.add(searchEngineSuggestionProvider) + } return providersToAdd } diff --git a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt index 00570df98..3cbc2a0aa 100644 --- a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt @@ -765,7 +765,7 @@ class AwesomeBarViewTest { } @Test - fun `GIVEN unified search feature is enabled WHEN configuring providers THEN add the engine suggestions provider`() { + fun `GIVEN unified search feature is enabled WHEN configuring providers THEN don't add the engine suggestions provider`() { val settings: Settings = mockk(relaxed = true) { every { showUnifiedSearchFeature } returns true } @@ -776,7 +776,7 @@ class AwesomeBarViewTest { val result = awesomeBarView.getProvidersToAdd(state) - assertEquals(1, result.filterIsInstance().size) + assertEquals(0, result.filterIsInstance().size) } @Test @@ -834,7 +834,7 @@ class AwesomeBarViewTest { } @Test - fun `GIVEN a search from the default engine with no suggestions asked WHEN configuring providers THEN add any provider`() { + fun `GIVEN a search from the default engine with no suggestions asked WHEN configuring providers THEN don't add any provider`() { val settings: Settings = mockk(relaxed = true) { every { showUnifiedSearchFeature } returns true } @@ -862,7 +862,7 @@ class AwesomeBarViewTest { assertEquals(0, result.filterIsInstance().size) assertEquals(0, result.filterIsInstance().size) assertEquals(0, result.filterIsInstance().size) - assertEquals(1, result.filterIsInstance().size) + assertEquals(0, result.filterIsInstance().size) } @Test