diff options
| author | vigneshrsastra <vigneshrsastra@google.com> | 2023-12-13 17:28:30 +0000 |
|---|---|---|
| committer | Vignesh Ramanathan <vigneshrsastra@google.com> | 2023-12-13 21:22:50 +0000 |
| commit | b5a0c7810e02cad32e98af8428c71ea6fbbfc834 (patch) | |
| tree | 67a1cf9ef097a77f99a70459b5925aa3c32ba41e | |
| parent | 9738805ffd06d07e53d99611cc5647b05bee6e36 (diff) | |
| download | Permission-b5a0c7810e02cad32e98af8428c71ea6fbbfc834.tar.gz | |
Fix for Overlapping Time Text UI
Fixes: b/299235452
Test: Tested Manually. Existing tests continue to pass.
Screen Recording: https://screenshot.googleplex.com/6bcg88tTfAPMAn8
Change-Id: Ie0cd5fb48727ea633b683975f6313491adc253de
| -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) |