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

Commit 22121193 authored Jul 17, 2024 by Treehugger Robot Committed by Android (Google) Code Review Jul 17, 2024

Merge "Remove unnecessary nestedScrollToScene modifiers" into main

parents abcb3972 893c22ee

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
		@@ -514,8 +514,7 @@ private fun SceneScope.SplitShade(
		.sysuiResTag("expanded_qs_scroll_view")
		.weight(1f)
		.thenIf(!isCustomizerShowing) {
		Modifier.verticalNestedScrollToScene()
		.verticalScroll(
		Modifier.verticalScroll(
		quickSettingsScrollState,
		enabled = isScrollable
		)