Merge "bouncer: improve a11y traversal order" into main (746f9633) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/PinBouncer.kt

+6 −1

Original line number	Diff line number	Diff line
		@@ -52,6 +52,8 @@ import androidx.compose.ui.graphics.Color
		import androidx.compose.ui.graphics.graphicsLayer
		import androidx.compose.ui.input.pointer.pointerInteropFilter
		import androidx.compose.ui.platform.LocalView
		import androidx.compose.ui.semantics.isTraversalGroup
		import androidx.compose.ui.semantics.semantics
		import androidx.compose.ui.unit.Dp
		import androidx.compose.ui.unit.dp
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		@@ -100,7 +102,10 @@ fun PinPad(viewModel: PinBouncerViewModel, verticalSpacing: Dp, modifier: Modifi
		columns = columns,
		verticalSpacing = verticalSpacing,
		horizontalSpacing = calculateHorizontalSpacingBetweenColumns(gridWidth = 300.dp),
		modifier = modifier.focusRequester(focusRequester).sysuiResTag("pin_pad_grid"),
		modifier =
		modifier.focusRequester(focusRequester).sysuiResTag("pin_pad_grid").semantics {
		isTraversalGroup = true
		},
		) {
		repeat(9) { index ->
		DigitButton(