summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVignesh Ramanathan <vigneshrsastra@google.com>2023-12-09 01:04:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-12-09 01:04:47 +0000
commitaa2c01bbd23d976ea7d4019243fc95da9b8be441 (patch)
treea30355775a38c45054070a61fb0f186b598d51f7
parent18b0c5679a05cb1958a1de02eed8514a8462dd39 (diff)
parentf3f388d5ecc921df9a36bbd8af49514e18ae8a7b (diff)
downloadPermission-aa2c01bbd23d976ea7d4019243fc95da9b8be441.tar.gz
Merge "Revert "Fix for Scroll Bar Visibility with RSB Scroll"" into main
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ScrollableScreen.kt6
1 files changed, 1 insertions, 5 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 9c7fba5f2..42161d923 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
@@ -19,7 +19,6 @@ package com.android.permissioncontroller.permission.ui.wear.elements
import android.graphics.drawable.Drawable
import androidx.compose.foundation.Image
import androidx.compose.foundation.focusable
-import androidx.compose.foundation.gestures.animateScrollBy
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
@@ -111,10 +110,7 @@ internal fun Scaffold(
Scaffold(
modifier =
Modifier.onRotaryScrollEvent {
- coroutineScope.launch {
- listState.scrollBy(it.verticalScrollPixels)
- listState.animateScrollBy(0f)
- }
+ coroutineScope.launch { listState.scrollBy(it.verticalScrollPixels) }
true
}
.focusRequester(focusRequester)