Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 893c22ee authored Jul 17, 2024 by omarmt

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

parent 43de60f2

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,6 @@ fun CommunalContainer(
		backgroundType = backgroundType,
		colors = colors,
		content = content,
		modifier = Modifier.horizontalNestedScrollToScene(),
		)
		}
		}

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -305,8 +305,7 @@ private fun SceneScope.QuickSettingsScene(
		if (isCustomizerShowing) {
		Modifier.fillMaxHeight().align(Alignment.TopCenter)
		} else {
		Modifier.verticalNestedScrollToScene()
		.verticalScroll(
		Modifier.verticalScroll(
		scrollState,
		enabled = isScrollable,
		)

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -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
		)