Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ec85a58 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add minor delay on requesting default focus, so TalkBack functions as expected." into main

parents ecdc2bac 34d7931c

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt

+7 −1
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ import com.android.systemui.keyboard.shortcut.ui.model.IconSource 
import com.android.systemui.keyboard.shortcut.ui.model.ShortcutCategoryUi

import com.android.systemui.keyboard.shortcut.ui.model.ShortcutsUiState

import com.android.systemui.res.R

import kotlinx.coroutines.delay



@Composable

fun ShortcutHelper(
@@ -901,7 +902,12 @@ private fun ShortcutsSearchBar(onQueryChange: (String) -> Unit) { 
    var queryInternal by remember { mutableStateOf("") }

    val focusRequester = remember { FocusRequester() }

    val focusManager = LocalFocusManager.current

    LaunchedEffect(Unit) { focusRequester.requestFocus() }

    LaunchedEffect(Unit) {

        // TODO(b/272065229): Added minor delay so TalkBack can take focus of search box by default,

        //  remove when default a11y focus is fixed.

        delay(50)

        focusRequester.requestFocus()

    }

    SearchBar(

        modifier =

            Modifier.fillMaxWidth().focusRequester(focusRequester).onKeyEvent {