diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 00:41:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-15 00:41:34 +0000 |
| commit | 0b97c9aa6289f63dd5989cb8390d8665961a95a0 (patch) | |
| tree | 04541dfb33baf5fc0389feb04471de4086f5a047 | |
| parent | 7d42b9cd21411a95d5b2a3a8ba01db93825c2394 (diff) | |
| parent | 86779ec3fee72a3c5924074017a2760ef33a0edf (diff) | |
| download | Permission-android14-qpr2-release.tar.gz | |
Snap for 11220357 from 86779ec3fee72a3c5924074017a2760ef33a0edf to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: Idcf4387d0653ec42dd835111d954675bcfcfac7b
2 files changed, 15 insertions, 4 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) diff --git a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS index d9f93959b..6214fba50 100644 --- a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS +++ b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/television/OWNERS @@ -6,5 +6,4 @@ bronger@google.com galinap@google.com philipjunker@google.com rgl@google.com -robhor@google.com valiiftime@google.com |