[fenix] For https://github.com/mozilla-mobile/fenix/issues/4333: Open the keyboard when a search engine is selected (https://github.com/mozilla-mobile/fenix/pull/14353)

Co-authored-by: Elise Richards <erichards@mozilla.com>

app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt

@@ -56,7 +56,8 @@ class SearchDialogController(
     private val settings: Settings,
     private val metrics: MetricController,
     private val dismissDialog: () -> Unit,
-    private val clearToolbarFocus: () -> Unit
+    private val clearToolbarFocus: () -> Unit,
+    private val focusToolbar: () -> Unit
 ) : SearchController {
 
     override fun handleUrlCommitted(url: String) {
@@ -181,6 +182,7 @@ class SearchDialogController(
     }
 
     override fun handleSearchShortcutEngineSelected(searchEngine: SearchEngine) {
+        focusToolbar()
         fragmentStore.dispatch(SearchFragmentAction.SearchShortcutEngineSelected(searchEngine))
         val isCustom = searchEngine.type == SearchEngine.Type.CUSTOM
         metrics.track(Event.SearchShortcutSelected(searchEngine, isCustom))

app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt

@@ -150,7 +150,8 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
                 clearToolbarFocus = {
                     toolbarView.view.hideKeyboard()
                     toolbarView.view.clearFocus()
-                }
+                },
+                focusToolbar = { toolbarView.view.edit.focus() }
             )
         )
 

app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt

@@ -48,6 +48,7 @@ class SearchDialogControllerTest {
     @MockK(relaxed = true) private lateinit var settings: Settings
     @MockK private lateinit var sessionManager: SessionManager
     @MockK(relaxed = true) private lateinit var clearToolbarFocus: () -> Unit
+    @MockK(relaxed = true) private lateinit var focusToolbar: () -> Unit
     @MockK(relaxed = true) private lateinit var dismissDialog: () -> Unit
 
     private lateinit var controller: SearchDialogController
@@ -76,7 +77,8 @@ class SearchDialogControllerTest {
             settings = settings,
             metrics = metrics,
             dismissDialog = dismissDialog,
-            clearToolbarFocus = clearToolbarFocus
+            clearToolbarFocus = clearToolbarFocus,
+            focusToolbar = focusToolbar
         )
     }
 
@@ -286,6 +288,7 @@ class SearchDialogControllerTest {
 
         controller.handleSearchShortcutEngineSelected(searchEngine)
 
+        verify { focusToolbar() }
         verify { store.dispatch(SearchFragmentAction.SearchShortcutEngineSelected(searchEngine)) }
         verify { metrics.track(Event.SearchShortcutSelected(searchEngine, false)) }
     }