Snap for 13219462 from 226ff02665a81ffd1aecd76c4d395b8d5bcfad3c to 25Q2-release

Change-Id: Id5b21c4294a0987708dd50e7d7276a596a2cf2ae

5 files changed, 23 insertions, 5 deletions

diff --git a/PermissionController/res/values-es-rUS/strings.xml b/PermissionController/res/values-es-rUS/strings.xml
index 0a8908fd7..94179a6e7 100644
--- a/PermissionController/res/values-es-rUS/strings.xml
+++ b/PermissionController/res/values-es-rUS/strings.xml
@@ -370,7 +370,7 @@
     <string name="role_dialer_request_description" msgid="6288839625724909320">"Esta app obtendrá acceso a la cámara, los contactos, micrófono, teléfono y SMS"</string>
     <string name="role_dialer_search_keywords" msgid="3324448983559188087">"marcador"</string>
     <string name="role_sms_label" msgid="8456999857547686640">"App de SMS predeterminada"</string>
-    <string name="role_sms_short_label" msgid="4371444488034692243">"app de SMS"</string>
+    <string name="role_sms_short_label" msgid="4371444488034692243">"App de SMS"</string>
     <string name="role_sms_description" msgid="3424020199148153513">"Apps que te permiten usar tu número de teléfono para enviar y recibir mensajes de texto cortos, fotos, videos y mucho más"</string>
     <string name="role_sms_request_title" msgid="7953552109601185602">"¿Quieres establecer <xliff:g id="APP_NAME">%1$s</xliff:g> como app de SMS predeterminada?"</string>
     <string name="role_sms_request_description" msgid="2691004766132144886">"Se le otorgará acceso a esta app a tu cámara, contactos, archivos y contenido multimedia, micrófono, teléfono y SMS"</string>
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/WearPermissionButtonStyle.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButtonStyle.kt
index 114bcd4bc..f48d47b2c 100644
--- a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButtonStyle.kt
+++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButtonStyle.kt
@@ -16,6 +16,7 @@
 package com.android.permissioncontroller.wear.permission.components.material3
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
 import androidx.wear.compose.material.ChipColors
 import androidx.wear.compose.material.ChipDefaults
 import androidx.wear.compose.material3.ButtonColors
@@ -26,6 +27,7 @@ import com.android.permissioncontroller.wear.permission.components.material3.Wea
 import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle.Primary
 import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle.Secondary
 import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle.Transparent
+import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle.Warning
 
 /**
  * This component is wrapper on material control colors, It applies the right colors based material
@@ -36,6 +38,7 @@ enum class WearPermissionButtonStyle {
     Secondary,
     Transparent,
     DisabledLike,
+    Warning,
 }
 
 @Composable
@@ -45,6 +48,11 @@ internal fun WearPermissionButtonStyle.material2ChipColors(): ChipColors {
         Secondary -> ChipDefaults.secondaryChipColors()
         Transparent -> ChipDefaults.childChipColors()
         DisabledLike -> chipDisabledColors()
+        Warning ->
+            ChipDefaults.secondaryChipColors(
+                backgroundColor =
+                    Color(red = 65, green = 14, blue = 11, alpha = (0.8f * 255).toInt())
+            )
     }
 }
 
@@ -55,6 +63,11 @@ internal fun WearPermissionButtonStyle.material3ButtonColors(): ButtonColors {
         Secondary -> ButtonDefaults.filledTonalButtonColors()
         Transparent -> ButtonDefaults.childButtonColors()
         DisabledLike -> ButtonDefaults.disabledLikeColors()
+        Warning ->
+            ButtonDefaults.buttonColors(
+                containerColor =
+                    Color(red = 65, green = 14, blue = 11, alpha = (0.8f * 255).toInt())
+            )
     }
 }
 
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),
                 )
             }
         }
diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
index 2547b9786..4476d934b 100644
--- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml
+++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
@@ -5394,13 +5394,13 @@
          corresponding permission such as {@link #HEAD_TRACKING} or
          {@link #FACE_TRACKING} for the data being accessed.
 
-         <p>Protection level: normal|appop
+         <p>Protection level: signature|privileged
 
          @SystemApi
          @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES)
          @hide -->
     <permission android:name="android.permission.XR_TRACKING_IN_BACKGROUND"
-                android:protectionLevel="normal|appop"
+                android:protectionLevel="signature|privileged"
                 android:description="@string/permdesc_xr_tracking_in_background"
                 android:label="@string/permlab_xr_tracking_in_background"
                 android:featureFlag="android.xr.xr_manifest_entries" />