Merge "Denote categories and the shortcut list as traversal groups." into main (9647bc1f) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ import androidx.compose.ui.platform.LocalFocusManager
		import androidx.compose.ui.res.painterResource
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.semantics.Role
		import androidx.compose.ui.semantics.isTraversalGroup
		import androidx.compose.ui.semantics.role
		import androidx.compose.ui.semantics.semantics
		import androidx.compose.ui.text.SpanStyle
		@@ -400,7 +401,7 @@ private fun ShortcutHelperTwoPane(
		Row(Modifier.fillMaxWidth()) {
		StartSidePanel(
		onSearchQueryChanged = onSearchQueryChanged,
		modifier = Modifier.width(240.dp),
		modifier = Modifier.width(240.dp).semantics { isTraversalGroup = true },
		categories = categories,
		onKeyboardSettingsClicked = onKeyboardSettingsClicked,
		selectedCategory = selectedCategoryType,
		@@ -409,7 +410,7 @@ private fun ShortcutHelperTwoPane(
		Spacer(modifier = Modifier.width(24.dp))
		EndSidePanel(
		searchQuery,
		Modifier.fillMaxSize().padding(top = 8.dp),
		Modifier.fillMaxSize().padding(top = 8.dp).semantics { isTraversalGroup = true },
		selectedCategory,
		isCustomizing = isCustomizing,
		onCustomizationRequested = onCustomizationRequested,