From 4daa618db64766ded7c3c28611725cd209b52564 Mon Sep 17 00:00:00 2001 From: Alexandru2909 Date: Mon, 31 Oct 2022 15:59:51 +0200 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/25813 - Use specific hint for history, bookmarks and tab unified search --- .../org/mozilla/fenix/search/toolbar/ToolbarView.kt | 12 +++++++++--- app/src/main/res/values/strings.xml | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt index 97edb87f7..0fc4828dc 100644 --- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt @@ -16,6 +16,7 @@ import mozilla.components.support.ktx.android.content.getColorFromAttr import mozilla.components.support.ktx.android.content.res.resolveAttribute import mozilla.components.support.ktx.android.view.hideKeyboard import org.mozilla.fenix.R +import org.mozilla.fenix.components.Core import org.mozilla.fenix.search.SearchFragmentState import org.mozilla.fenix.utils.Settings @@ -147,11 +148,16 @@ class ToolbarView( val searchEngine = searchState.searchEngineSource.searchEngine - when (searchEngine?.type) { + view.edit.hint = when (searchEngine?.type) { SearchEngine.Type.APPLICATION -> - view.edit.hint = context.getString(R.string.application_search_hint) + when (searchEngine.id) { + Core.HISTORY_SEARCH_ENGINE_ID -> context.getString(R.string.history_search_hint) + Core.BOOKMARKS_SEARCH_ENGINE_ID -> context.getString(R.string.bookmark_search_hint) + Core.TABS_SEARCH_ENGINE_ID -> context.getString(R.string.tab_search_hint) + else -> context.getString(R.string.application_search_hint) + } else -> - view.edit.hint = context.getString(R.string.search_hint) + context.getString(R.string.search_hint) } if (!settings.showUnifiedSearchFeature && searchEngine != null) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 84f390873..07086f964 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,6 +16,12 @@ Disable private browsing Search or enter address + + Search history + + Search bookmarks + + Search tabs Enter search terms