diff options
2 files changed, 14 insertions, 2 deletions
diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffold.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffold.kt index 19423f5b0..208d3d6ec 100644 --- a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffold.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffold.kt @@ -60,7 +60,6 @@ import androidx.wear.compose.material3.ScreenScaffold import androidx.wear.compose.material3.ScrollIndicator import androidx.wear.compose.material3.Text import androidx.wear.compose.material3.TimeText -import androidx.wear.compose.material3.lazy.scrollTransform import com.android.permissioncontroller.wear.permission.components.AnnotatedText import com.android.permissioncontroller.wear.permission.components.ListScopeWrapper import com.android.permissioncontroller.wear.permission.components.material2.Wear2Scaffold @@ -74,7 +73,7 @@ private class TransformingScopeConverter(private val scope: TransformingLazyColu ListScopeWrapper { override fun item(key: Any?, contentType: Any?, content: @Composable () -> Unit) { // TODO:https://buganizer.corp.google.com/issues/389093588. - scope.item { Box(modifier = Modifier.scrollTransform(this)) { content() } } + scope.item { content() } } override fun items( 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, |