Merge "Support soft hyphens in button subtitle" into main

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),
                 )
             }
         }