For #25813 - Use specific hint for history, bookmarks and tab unified search

pull/543/head
Alexandru2909 2 years ago committed by mergify[bot]
parent c75efe35b3
commit 4047d97ad6

@ -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) {

@ -16,6 +16,12 @@
<string name="content_description_disable_private_browsing_button">Disable private browsing</string>
<!-- Placeholder text shown in the search bar before a user enters text -->
<string name="search_hint">Search or enter address</string>
<!-- Placeholder text shown in search bar when using history search -->
<string name="history_search_hint">Search history</string>
<!-- Placeholder text shown in search bar when using bookmarks search -->
<string name="bookmark_search_hint">Search bookmarks</string>
<!-- Placeholder text shown in search bar when using tabs search -->
<string name="tab_search_hint">Search tabs</string>
<!-- Placeholder text shown in the search bar when using application search engines -->
<string name="application_search_hint">Enter search terms</string>
<!-- No Open Tabs Message Description -->

Loading…
Cancel
Save