diff options
| author | 2024-12-09 19:30:26 +0000 | |
|---|---|---|
| committer | 2024-12-09 19:30:26 +0000 | |
| commit | 450f8ab14dfecc9a5061d30c8e3d6864cc21fb9b (patch) | |
| tree | a270bd2fc0f3f61ce5d63d7bf80cc1059e627de3 | |
| parent | 7c5c1196815a32999f66c771eb1a1e1e668267b4 (diff) | |
| parent | f011e7b77f7a3970ca7dea8cf1adc35f614d91e9 (diff) | |
Merge "Fixed irregular talkback navigation in shortcut helper" into main
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt index 272491850c9c..af6f0cb2ec83 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt @@ -615,7 +615,7 @@ private fun Shortcut( } .focusable(interactionSource = interactionSource) .padding(8.dp) - .semantics { contentDescription = shortcut.contentDescription } + .semantics(mergeDescendants = true) { contentDescription = shortcut.contentDescription } ) { Row( modifier = |