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

Commit bcab44d8 authored by Josh's avatar Josh
Browse files

Search bar will receive focus by default in shortcut helper 

Test: Manual - trigger shortcut helper using the shortcut Action + /, ensure that focus is on
the search bar
Fixes: 352254683
Flag: com.android.systemui.keyboard_shortcut_helper_rewrite

Change-Id: I6e2b56033e92d95094245c60c02df68e7f7b524f
parent 23887b40

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

+6 −1
Original line number Diff line number Diff line
@@ -70,12 +70,15 @@ import androidx.compose.material3.TopAppBarDefaults 
import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass

import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass

import androidx.compose.runtime.Composable

import androidx.compose.runtime.LaunchedEffect

import androidx.compose.runtime.getValue

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.remember

import androidx.compose.runtime.setValue

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.focus.FocusRequester

import androidx.compose.ui.focus.focusRequester

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.RectangleShape

import androidx.compose.ui.graphics.Shape
@@ -642,8 +645,10 @@ private fun TitleBar() { 
@OptIn(ExperimentalMaterial3Api::class)

private fun ShortcutsSearchBar() {

    var query by remember { mutableStateOf("") }

    val focusRequester = remember { FocusRequester() }

    LaunchedEffect(Unit) { focusRequester.requestFocus() }

    SearchBar(

        modifier = Modifier.fillMaxWidth(),

        modifier = Modifier.fillMaxWidth().focusRequester(focusRequester),

        colors = SearchBarDefaults.colors(containerColor = MaterialTheme.colorScheme.surfaceBright),

        query = query,

        active = false,