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 1a1b32aa8..8d2adfcec 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 @@ -10,6 +10,7 @@ import androidx.core.graphics.BlendModeCompat.SRC_IN import androidx.core.graphics.drawable.toBitmap import mozilla.components.browser.state.search.SearchEngine import mozilla.components.browser.state.state.searchEngines +import mozilla.components.browser.state.state.selectedOrDefaultSearchEngine import mozilla.components.concept.awesomebar.AwesomeBar import mozilla.components.concept.engine.EngineSession import mozilla.components.feature.awesomebar.provider.BookmarksStorageSuggestionProvider @@ -176,6 +177,7 @@ class AwesomeBarView( BrowsingMode.Normal -> false BrowsingMode.Private -> true }, + suggestionsHeader = getSearchEngineSuggestionsHeader(), ) defaultSearchActionProvider = @@ -184,6 +186,7 @@ class AwesomeBarView( searchUseCase = searchUseCase, icon = searchBitmap, showDescription = false, + suggestionsHeader = getSearchEngineSuggestionsHeader(), ) shortcutsEnginePickerProvider = @@ -207,6 +210,25 @@ class AwesomeBarView( searchSuggestionProviderMap = HashMap() } + private fun getSearchEngineSuggestionsHeader(): String? { + val searchState = activity.components.core.store.state.search + var searchEngine = searchState.selectedOrDefaultSearchEngine?.name + + if (!searchEngine.isNullOrEmpty()) { + searchEngine = when (searchEngine) { + GOOGLE_SEARCH_ENGINE_NAME -> activity.getString( + R.string.google_search_engine_suggestion_header, + ) + else -> activity.getString( + R.string.other_default_search_engine_suggestion_header, + searchEngine, + ) + } + } + + return searchEngine + } + fun update(state: SearchFragmentState) { // Do not make suggestions based on user's current URL unless it's a search shortcut if (state.query.isNotEmpty() && state.query == state.url && !state.showSearchShortcuts) { @@ -355,6 +377,8 @@ class AwesomeBarView( companion object { // Maximum number of suggestions returned. const val METADATA_SUGGESTION_LIMIT = 3 + + const val GOOGLE_SEARCH_ENGINE_NAME = "Google" } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a51a48e7c..d6fad0aab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1829,6 +1829,14 @@ Auto-close enabled + + + Firefox Suggest + + Google Search + + %s search + Set links from websites, emails, and messages to open automatically in Firefox. @@ -1866,7 +1874,6 @@ Enable telemetry to send data. Go to settings - Firefox Suggest