Wear: Enable auto hyphenating on wear toggleable chips.

Bug: 389592634
Test: Built locally and saw hyphened words on multiple lines.
Flag: EXEMPT bugfix
Change-Id: I1245921272fa78e488d255bb7d1d469b769f95c2
Relnote: Support auto-hyphenation on Wear toggleable chips.
LOW_COVERAGE_REASON=OTHER_FORM_FACTOR

2 files changed, 7 insertions, 2 deletions

diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material2/ToggleChip.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ToggleChip.kt
index de8e0542d..46a55bdc7 100644
--- a/PermissionController/wear-permission-components/src/wear.permission.components/material2/ToggleChip.kt
+++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ToggleChip.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
+import androidx.compose.ui.text.style.Hyphens
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.wear.compose.material.ChipDefaults
@@ -78,7 +79,7 @@ fun ToggleChip(
             textAlign = TextAlign.Start,
             overflow = TextOverflow.Ellipsis,
             maxLines = labelMaxLine ?: if (hasSecondaryLabel) 1 else 2,
-            style = MaterialTheme.typography.button,
+            style = MaterialTheme.typography.button.copy(hyphens = Hyphens.Auto),
         )
     }
 
@@ -89,7 +90,7 @@ fun ToggleChip(
                     text = secondaryLabel,
                     overflow = TextOverflow.Ellipsis,
                     maxLines = secondaryLabelMaxLine ?: 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/WearPermissionToggleControl.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionToggleControl.kt
index 1dfb90682..7998f43de 100644
--- a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionToggleControl.kt
+++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionToggleControl.kt
@@ -23,8 +23,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
+import androidx.compose.ui.text.style.Hyphens
 import androidx.wear.compose.material3.CheckboxButton
 import androidx.wear.compose.material3.LocalTextConfiguration
+import androidx.wear.compose.material3.LocalTextStyle
 import androidx.wear.compose.material3.RadioButton
 import androidx.wear.compose.material3.SwitchButton
 import androidx.wear.compose.material3.Text
@@ -112,6 +114,7 @@ private fun WearPermissionToggleControlInternal(
             text = label,
             modifier = Modifier.fillMaxWidth(),
             maxLines = labelMaxLines ?: LocalTextConfiguration.current.maxLines,
+            style = LocalTextStyle.current.copy(hyphens = Hyphens.Auto),
         )
     }
 
@@ -122,6 +125,7 @@ private fun WearPermissionToggleControlInternal(
                     text = it,
                     modifier = Modifier.fillMaxWidth(),
                     maxLines = secondaryLabelMaxLines ?: LocalTextConfiguration.current.maxLines,
+                    style = LocalTextStyle.current.copy(hyphens = Hyphens.Auto),
                 )
             }
         }