diff options
| author | 2025-03-08 22:47:51 +0000 | |
|---|---|---|
| committer | 2025-03-11 15:16:07 -0700 | |
| commit | 0fba196ac2bd65957147ec339bcaa5e3ffc7a501 (patch) | |
| tree | 6f9452cd99e765a65712bec8ecfd144a8731d9d8 | |
| parent | 76a3ee8ff5376dc48feb4871370cf25366df7dc8 (diff) | |
Support soft hyphens in button subtitle
Bug: b/342445155
Relnote: "N/A"
FLAG: EXEMPT refactor
Test: Build Succeeds. Existing CTS tests passes.
Change-Id: Id060b68c3a77b280c39b9cd5148b1f0259107105
LOW_COVERAGE_REASON=OTHER_FORM_FACTOR
2 files changed, 2 insertions, 1 deletions
diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt index 23074a06f..57fdbca03 100644 --- a/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt @@ -205,7 +205,7 @@ fun Chip( color = secondaryTextColor, overflow = TextOverflow.Ellipsis, maxLines = secondaryLabelMaxLines ?: 1, - style = MaterialTheme.typography.caption2, + style = MaterialTheme.typography.caption2.copy(hyphens = Hyphens.Auto), ) } } diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt index 5f1c8dd2c..320e58964 100644 --- a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt @@ -123,6 +123,7 @@ internal fun WearPermissionButtonInternal( text = secondaryLabel, modifier = Modifier.fillMaxWidth(), maxLines = secondaryLabelMaxLines ?: LocalTextConfiguration.current.maxLines, + style = LocalTextStyle.current.copy(hyphens = Hyphens.Auto), ) } } |