diff options
| author | 2024-07-17 14:36:49 +0000 | |
|---|---|---|
| committer | 2024-07-17 14:57:49 +0000 | |
| commit | 893c22ee94aa3abc7bc9a2c679aaed34d8ff0061 (patch) | |
| tree | 61fbddaf237d840bac615706aa5826ebe103648f | |
| parent | 43de60f2e56860a0ae9c1ebc698cb8479450ad18 (diff) | |
Remove unnecessary nestedScrollToScene modifiers
Context: Support for automatic nested scrolling in STL has recently been
added in ag/28322124
Test: Tested manually
Bug: 336710600
Flag: com.android.systemui.scene_container
Change-Id: I14cc77fd70dd8d64f1c534a06af3a4538746fb68
3 files changed, 2 insertions, 5 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt index 43d51c37aa36..0f38a6aff85e 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt @@ -209,7 +209,6 @@ fun CommunalContainer( backgroundType = backgroundType, colors = colors, content = content, - modifier = Modifier.horizontalNestedScrollToScene(), ) } } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt index 2d5d25913074..9afe2aede1e2 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt @@ -305,8 +305,7 @@ private fun SceneScope.QuickSettingsScene( if (isCustomizerShowing) { Modifier.fillMaxHeight().align(Alignment.TopCenter) } else { - Modifier.verticalNestedScrollToScene() - .verticalScroll( + Modifier.verticalScroll( scrollState, enabled = isScrollable, ) diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt index 4a6599a04fab..5c57488c5cd2 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt @@ -497,8 +497,7 @@ private fun SceneScope.SplitShade( .sysuiResTag("expanded_qs_scroll_view") .weight(1f) .thenIf(!isCustomizerShowing) { - Modifier.verticalNestedScrollToScene() - .verticalScroll( + Modifier.verticalScroll( quickSettingsScrollState, enabled = isScrollable ) |