tor-browser

commit b0974e7912c1292375895388fe0e5deada976a12
parent 3b35e32f54973d266d2c1c42ea160e61eecb8876
Author: Cathy Lu <calu@mozilla.com>
Date:   Wed,  7 Jan 2026 16:38:14 +0000

Bug 2008816 - Tab search button in keyboard should dismiss keyboard r=android-reviewers,007

Differential Revision: https://phabricator.services.mozilla.com/D278054

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/tabsearch/TabSearchScreen.kt
 | 
10
+++++++++-

1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/tabsearch/TabSearchScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/tabsearch/TabSearchScreen.kt
@@ -39,6 +39,8 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -81,6 +83,8 @@ fun TabSearchScreen(
     val searchBarState = rememberSearchBarState()
     var expanded by remember { mutableStateOf(false) }
     val focusRequester = remember { FocusRequester() }
+    val focusManager = LocalFocusManager.current
+    val keyboardController = LocalSoftwareKeyboardController.current
     LaunchedEffect(Unit) {
         focusRequester.requestFocus()
     }
@@ -93,7 +97,11 @@ fun TabSearchScreen(
                     .padding(horizontal = 8.dp),
                 query = state.query,
                 onQueryChange = { store.dispatch(TabSearchAction.SearchQueryChanged(it)) },
-                onSearch = { submitted -> store.dispatch(TabSearchAction.SearchQueryChanged(submitted)) },
+                onSearch = { submitted ->
+                    store.dispatch(TabSearchAction.SearchQueryChanged(submitted))
+                    focusManager.clearFocus()
+                    keyboardController?.hide()
+                },
                 expanded = expanded,
                 onExpandedChange = { expanded = it },
                 placeholder = {