diff options
| author | Vignesh Ramanathan <vigneshrsastra@google.com> | 2023-12-09 01:04:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-09 01:04:47 +0000 |
| commit | a6b9e71b88c3918a0b146075c3f61f3251e18255 (patch) | |
| tree | 5935d69c88f8f7ad404e602cdba77e407543fdd9 | |
| parent | aa2c01bbd23d976ea7d4019243fc95da9b8be441 (diff) | |
| parent | c404648d1bf49ae0a25a0537405ca8310592f9fc (diff) | |
| download | Permission-a6b9e71b88c3918a0b146075c3f61f3251e18255.tar.gz | |
Merge "Revert "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, 3 insertions, 15 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 42161d923..d9a42e33e 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 @@ -100,10 +100,8 @@ 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 = initialCenterIndex) } + val listState = remember { ScalingLazyListState(initialCenterItemIndex = 0) } val coroutineScope = rememberCoroutineScope() MaterialTheme { @@ -119,12 +117,7 @@ internal fun Scaffold( timeText = { if (showTimeText && !isLoading) { TimeText( - modifier = - Modifier.scrollAway( - listState, - initialCenterIndex, - scrollContentTopPadding - ), + modifier = Modifier.scrollAway(listState), contentPadding = PaddingValues(15.dp) ) } @@ -142,12 +135,7 @@ internal fun Scaffold( // content. autoCentering = null, contentPadding = - PaddingValues( - start = 10.dp, - end = 10.dp, - top = scrollContentTopPadding, - bottom = 70.dp - ) + PaddingValues(start = 10.dp, end = 10.dp, top = 32.dp, bottom = 70.dp) ) { image?.let { val imageModifier = Modifier.size(24.dp) |