From 8a248729923f7aa8e9dd0c5b691deb40cd1544d5 Mon Sep 17 00:00:00 2001 From: sarah541 Date: Wed, 6 Jul 2022 17:53:40 -0400 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/25894 - Add firefox suggest header for lib suggestions --- .../fenix/search/awesomebar/AwesomeBarView.kt | 15 ++++++++++----- .../fenix/search/awesomebar/AwesomeBarWrapper.kt | 3 ++- app/src/main/res/values/strings.xml | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) 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 858352fbf1..e942db0fb3 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 @@ -107,7 +107,8 @@ class AwesomeBarView( selectTabUseCase, components.core.icons, getDrawable(activity, R.drawable.ic_search_results_tab), - excludeSelectedSession = !fromHomeFragment + excludeSelectedSession = !fromHomeFragment, + suggestionsHeader = activity.getString(R.string.firefox_suggest_header), ) historyStorageProvider = @@ -115,7 +116,8 @@ class AwesomeBarView( components.core.historyStorage, loadUrlUseCase, components.core.icons, - engineForSpeculativeConnects + engineForSpeculativeConnects, + suggestionsHeader = activity.getString(R.string.firefox_suggest_header), ) combinedHistoryProvider = @@ -125,7 +127,8 @@ class AwesomeBarView( loadUrlUseCase = loadUrlUseCase, icons = components.core.icons, engine = engineForSpeculativeConnects, - maxNumberOfSuggestions = METADATA_SUGGESTION_LIMIT + maxNumberOfSuggestions = METADATA_SUGGESTION_LIMIT, + suggestionsHeader = activity.getString(R.string.firefox_suggest_header), ) bookmarksStorageSuggestionProvider = @@ -134,7 +137,8 @@ class AwesomeBarView( loadUrlUseCase = loadUrlUseCase, icons = components.core.icons, indicatorIcon = getDrawable(activity, R.drawable.ic_search_results_bookmarks), - engine = engineForSpeculativeConnects + engine = engineForSpeculativeConnects, + suggestionsHeader = activity.getString(R.string.firefox_suggest_header), ) syncedTabsStorageSuggestionProvider = @@ -146,7 +150,8 @@ class AwesomeBarView( getDrawable(activity, R.drawable.ic_search_results_device_desktop), getDrawable(activity, R.drawable.ic_search_results_device_mobile), getDrawable(activity, R.drawable.ic_search_results_device_tablet) - ) + ), + suggestionsHeader = activity.getString(R.string.firefox_suggest_header), ) val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply { diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt index 1167890f8f..836504dbbd 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt @@ -57,7 +57,8 @@ class AwesomeBarWrapper @JvmOverloads constructor( background = Color.Transparent, title = ThemeManager.resolveAttributeColor(R.attr.textPrimary), description = ThemeManager.resolveAttributeColor(R.attr.textSecondary), - autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.textSecondary) + autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.textSecondary), + groupTitle = ThemeManager.resolveAttributeColor(R.attr.textSecondary), ), onSuggestionClicked = { suggestion -> suggestion.onSuggestionClicked?.invoke() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0874c8ff57..bdb66a08cc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1787,4 +1787,5 @@ Enable telemetry to send data. Go to settings + Firefox Suggest