From c15d2a93b7b4bb049f3b2f96e29dd411866d350e Mon Sep 17 00:00:00 2001 From: DreVla Date: Tue, 6 Dec 2022 16:51:54 +0200 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/28090: Show QR scanner when general or custom search engine is selected --- .../java/org/mozilla/fenix/search/SearchDialogFragment.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index 22d03409db..016b3a9175 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -811,7 +811,10 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { } private fun updateQrButton(searchFragmentState: SearchFragmentState) { - when (searchFragmentState.searchEngineSource.searchEngine == searchFragmentState.defaultEngine) { + val searchEngine = searchFragmentState.searchEngineSource.searchEngine + when ( + searchEngine?.isGeneral == true || searchEngine?.type == SearchEngine.Type.CUSTOM + ) { true -> { if (qrButtonAction == null) { qrButtonAction = IncreasedTapAreaActionDecorator(