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 d703474cad..a5c11f99b7 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -83,6 +83,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { private lateinit var interactor: SearchDialogInteractor private lateinit var store: SearchDialogFragmentStore private lateinit var toolbarView: ToolbarView + private lateinit var inlineAutocompleteEditText: InlineAutocompleteEditText private lateinit var awesomeBarView: AwesomeBarView private val qrFeature = ViewBoundFeatureWrapper() @@ -176,9 +177,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { }, focusToolbar = { toolbarView.view.edit.focus() }, clearToolbar = { - toolbarView.view - .findViewById(R.id.mozac_browser_toolbar_edit_url_view) - ?.setText("") + inlineAutocompleteEditText.setText("") } ) ) @@ -194,7 +193,9 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { binding.toolbar, requireComponents.core.engine, fromHomeFragment - ) + ).also { + inlineAutocompleteEditText = it.view.findViewById(R.id.mozac_browser_toolbar_edit_url_view) + } val awesomeBar = binding.awesomeBar @@ -212,9 +213,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { awesomeBarView.view.setOnEditSuggestionListener(toolbarView.view::setSearchTerms) - val urlView = toolbarView.view - .findViewById(R.id.mozac_browser_toolbar_edit_url_view) - urlView?.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO + inlineAutocompleteEditText.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO requireComponents.core.engine.speculativeCreateSession(isPrivate) @@ -666,14 +665,11 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { } private fun updateToolbarContentDescription(source: SearchEngineSource) { - val urlView = toolbarView.view - .findViewById(R.id.mozac_browser_toolbar_edit_url_view) - source.searchEngine?.let { engine -> - toolbarView.view.contentDescription = engine.name + ", " + urlView.hint + toolbarView.view.contentDescription = engine.name + ", " + inlineAutocompleteEditText.hint } - urlView?.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO + inlineAutocompleteEditText.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO } private fun updateSearchShortcutsIcon(