summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author vignesh ramanathan <vigneshrsastra@google.com> 2025-03-04 21:25:56 +0000
committer Vignesh Ramanathan <vigneshrsastra@google.com> 2025-03-10 14:09:15 -0700
commitb2f75f1fcdac6ae563d28a47ce569f698a59b315 (patch)
treef0eb9266a1dbeb46ac39ecfb75115f8ca216432f
parentc85d32e09875ec2e849c60ea881913915fa7a6c0 (diff)
Updating Textsytle to CurvedTextStyle
This is to allow a library update where these have changed from TextStyle to CurvedTextStyle Bug: 400724021 Relnote: "N/A" FLAG: EXEMPT refactor Test: Build Succeeds. Existing CTS tests passes. Change-Id: Ib09c5142c851ce68152a10a3c2ed7c33d3d93026 LOW_COVERAGE_REASON=OTHER_FORM_FACTOR
-rw-r--r--PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt13
1 files changed, 13 insertions, 0 deletions
diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt
index e44a24981..c85381c1b 100644
--- a/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt
+++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontVariation
import androidx.compose.ui.unit.sp
+import androidx.wear.compose.foundation.CurvedTextStyle
import androidx.wear.compose.material3.Typography
import com.android.permissioncontroller.wear.permission.components.R
@@ -50,6 +51,18 @@ internal object WearComposeMaterial3Typography {
return FontFamily(font)
}
+ private fun CurvedTextStyle.updatedTextStyle(
+ context: Context,
+ @StringRes fontRes: Int,
+ variationSettings: FontVariation.Settings? = null,
+ @DimenRes fontSizeRes: Int,
+ ): CurvedTextStyle {
+ val fontFamily =
+ fontFamily(context = context, id = fontRes, variationSettings = variationSettings)
+ val fontSize = ResourceHelper.getDimen(context = context, id = fontSizeRes)?.sp ?: fontSize
+ return copy(fontFamily = fontFamily, fontSize = fontSize)
+ }
+
private fun TextStyle.updatedTextStyle(
context: Context,
@StringRes fontRes: Int,