diff options
| author | Vignesh Ramanathan <vigneshrsastra@google.com> | 2023-12-14 14:48:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-14 14:48:27 +0000 |
| commit | 86779ec3fee72a3c5924074017a2760ef33a0edf (patch) | |
| tree | 04541dfb33baf5fc0389feb04471de4086f5a047 | |
| parent | 655beff574f99fa4b7f8a067d33d13757a7a15ad (diff) | |
| parent | b5a0c7810e02cad32e98af8428c71ea6fbbfc834 (diff) | |
| download | Permission-86779ec3fee72a3c5924074017a2760ef33a0edf.tar.gz | |
Merge "Fix for Overlapping Time Text UI" into main
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ScrollableScreen.kt | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ScrollableScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ScrollableScreen.kt index 3776c596f..4228135f6 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ScrollableScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ScrollableScreen.kt @@ -140,8 +140,10 @@ internal fun Scaffold( titleTestTag: String? = null, subtitleTestTag: String? = null, ) { + val initialCenterIndex = 0 + val scrollContentTopPadding = 32.dp val focusRequester = remember { FocusRequester() } - val listState = remember { ScalingLazyListState(initialCenterItemIndex = 0) } + val listState = remember { ScalingLazyListState(initialCenterItemIndex = initialCenterIndex) } val coroutineScope = rememberCoroutineScope() MaterialTheme { @@ -157,7 +159,12 @@ internal fun Scaffold( timeText = { if (showTimeText && !isLoading) { TimeText( - modifier = Modifier.scrollAway(listState), + modifier = + Modifier.scrollAway( + listState, + initialCenterIndex, + scrollContentTopPadding + ), contentPadding = PaddingValues(15.dp) ) } @@ -175,7 +182,12 @@ internal fun Scaffold( // content. autoCentering = null, contentPadding = - PaddingValues(start = 10.dp, end = 10.dp, top = 32.dp, bottom = 70.dp) + PaddingValues( + start = 10.dp, + end = 10.dp, + top = scrollContentTopPadding, + bottom = 70.dp + ) ) { image?.let { val imageModifier = Modifier.size(24.dp) |