summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Josh <jmokut@google.com> 2024-12-09 12:54:39 +0000
committer Josh <jmokut@google.com> 2024-12-09 12:54:39 +0000
commitf011e7b77f7a3970ca7dea8cf1adc35f614d91e9 (patch)
treec7b74a30a82e48eb01ff58f564243d3368990f67
parent4ebe13b1232bf3ee5641945ae14c280fa061729c (diff)
Fixed irregular talkback navigation in shortcut helper
Test: Manual - Use talkback ensure you can navigate sequentialy through shortcut helper Flag: com.android.systemui.keyboard_shortcut_helper_rewrite Fix: 382590434 Change-Id: Ib44538e78ff7bce0f528c56e92abf1a0ce329772
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt2
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 =