diff options
| author | 2025-03-21 08:29:59 -0700 | |
|---|---|---|
| committer | 2025-03-21 08:29:59 -0700 | |
| commit | f592160b91b125a38ecafaf38055de4ebb81ee00 (patch) | |
| tree | 88a4279c3b3ddc592b50229ac4c683459188c063 /packages/SettingsLib | |
| parent | 27130b0ee903703c2c4cf203ce070ea2062d0c3c (diff) | |
| parent | 665c4e907010e49c2fa001ae61516907b4dd2ee2 (diff) | |
Merge "Fix button padding for right to left languages in SpaDialog" into main
Diffstat (limited to 'packages/SettingsLib')
| -rw-r--r-- | packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/dialog/SettingsAlterDialogContent.kt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/dialog/SettingsAlterDialogContent.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/dialog/SettingsAlterDialogContent.kt index 9f2210d852a9..058fe53f7201 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/dialog/SettingsAlterDialogContent.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/dialog/SettingsAlterDialogContent.kt @@ -46,6 +46,7 @@ import androidx.compose.ui.layout.Placeable import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEach import androidx.compose.ui.util.fastForEachIndexed @@ -226,7 +227,12 @@ internal fun AlertDialogFlowRow( val childrenMainAxisSizes = IntArray(placeables.size) { j -> placeables[j].width + - if (j < placeables.lastIndex) mainAxisSpacing.roundToPx() else 0 + if ((layoutDirection == LayoutDirection.Ltr && j < placeables.lastIndex) + || (layoutDirection == LayoutDirection.Rtl && j > 0)) { + mainAxisSpacing.roundToPx() + } else { + 0 + } } val arrangement = Arrangement.End val mainAxisPositions = IntArray(childrenMainAxisSizes.size) { 0 } |