Making Grant Screen to use SLC.

Bug: b/391709066
Relnote: "N/A"
FLAG: EXEMPT refactor
Test: Build Succeeds. Existing CTS tests passes.
Change-Id: I53c5a864cbc1fe08fcde7cb95a6c6895d038f7d7
LOW_COVERAGE_REASON=OTHER_FORM_FACTOR

3 files changed, 17 insertions, 15 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearGrantPermissionsScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearGrantPermissionsScreen.kt
index 3ed58cf4a..f918da729 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearGrantPermissionsScreen.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearGrantPermissionsScreen.kt
@@ -62,6 +62,7 @@ fun WearGrantPermissionsScreen(
     val materialUIVersion = ResourceHelper.materialUIVersionInApp
     ScrollableScreen(
         materialUIVersion = materialUIVersion,
+        asScalingList = true,
         showTimeText = false,
         image = icon.value,
         title = groupMessage.value,
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 208d3d6ec..87ca048bc 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
@@ -16,7 +16,6 @@
 package com.android.permissioncontroller.wear.permission.components.material3
 
 import android.graphics.drawable.Drawable
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.ScrollableState
 import androidx.compose.foundation.layout.Box
@@ -30,9 +29,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
@@ -53,6 +50,7 @@ import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState
 import androidx.wear.compose.foundation.lazy.rememberTransformingLazyColumnState
 import androidx.wear.compose.material3.AppScaffold
 import androidx.wear.compose.material3.CircularProgressIndicator
+import androidx.wear.compose.material3.Icon
 import androidx.wear.compose.material3.IconButtonDefaults
 import androidx.wear.compose.material3.ListHeader
 import androidx.wear.compose.material3.MaterialTheme
@@ -271,6 +269,7 @@ private fun BoxScope.LazyColumnView(
             titleItem(
                 text = title,
                 testTag = titleTestTag,
+                asScalingList = true,
                 contentPaddingValues = paddingDefaults.titlePaddingValues(subtitle == null),
             )
             subtitleItem(
@@ -287,6 +286,7 @@ private fun BoxScope.LazyColumnView(
         ScalingLazyColumn(
             contentPadding = scrollContentPadding,
             state = listState as ScalingLazyListState,
+            autoCentering = null,
             modifier = Modifier.background(MaterialTheme.colorScheme.background),
             content = { scrollingViewContent(ScalingScopeConverter(this)) },
         )
@@ -350,24 +350,25 @@ private fun ListScopeWrapper.iconItem(painter: Painter?, modifier: Modifier = Mo
     painter?.let {
         item {
             val iconColor = WearPermissionButtonStyle.Secondary.material3ButtonColors().iconColor
-            Image(
-                painter = it,
-                contentDescription = null,
-                contentScale = ContentScale.Crop,
-                modifier = modifier,
-                colorFilter = ColorFilter.tint(iconColor),
-            )
+            Icon(painter = it, contentDescription = null, modifier = modifier, tint = iconColor)
         }
     }
 
 private fun ListScopeWrapper.titleItem(
     text: String?,
+    asScalingList: Boolean,
     testTag: String?,
     contentPaddingValues: PaddingValues,
     modifier: Modifier = Modifier,
 ) =
     text?.let {
         item(contentType = "header") {
+            val style =
+                if (asScalingList) {
+                    MaterialTheme.typography.titleMedium
+                } else {
+                    MaterialTheme.typography.titleLarge
+                }
             ListHeader(
                 modifier = modifier.requiredHeightIn(1.dp), // We do not want default min height
                 contentPadding = contentPaddingValues,
@@ -376,7 +377,7 @@ private fun ListScopeWrapper.titleItem(
                     text = it,
                     textAlign = TextAlign.Center,
                     modifier = Modifier.optionalTestTag(testTag),
-                    style = MaterialTheme.typography.titleLarge.copy(hyphens = Hyphens.Auto),
+                    style = style.copy(hyphens = Hyphens.Auto),
                 )
             }
         }
diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffoldPaddingDefaults.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffoldPaddingDefaults.kt
index 595fb50a3..01b8fc4be 100644
--- a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffoldPaddingDefaults.kt
+++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffoldPaddingDefaults.kt
@@ -25,15 +25,15 @@ data class WearPermissionScaffoldPaddingDefaults(
     private val screenHeight: Int,
 ) {
     private val scrollContentHorizontalPadding = (screenWidth * 0.052).dp
-    private val titleHorizontalPadding = (screenWidth * 0.0520).dp
-    private val subtitleHorizontalPadding = (screenWidth * 0.0624).dp
+    private val titleHorizontalPadding = (screenWidth * 0.1200).dp
+    private val subtitleHorizontalPadding = (screenWidth * 0.0416).dp
     private val scrollContentTopPadding = (screenHeight * 0.1664).dp
     private val dialogScrollContentLargeTopPadding = (screenHeight * 0.10).dp
     private val dialogScrollContentTopPadding = (screenHeight * 0.012).dp
     private val scrollContentBottomPadding = (screenHeight * 0.3646).dp
     private val noPadding = 0.dp
     private val defaultItemPadding = 4.dp
-    private val largeItemPadding = 8.dp
+    private val largeItemPadding = 12.dp
     private val extraLargePadding = 12.dp
 
     fun titlePaddingValues(needsLargePadding: Boolean): PaddingValues =
@@ -48,7 +48,7 @@ data class WearPermissionScaffoldPaddingDefaults(
         PaddingValues(
             start = subtitleHorizontalPadding,
             top = if (needsLargePadding) extraLargePadding else noPadding,
-            bottom = largeItemPadding,
+            bottom = 8.dp,
             end = subtitleHorizontalPadding,
         )