Merge "Fix Volume Panel vertical scroll" into main (c187b1e4) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/ui/composable/VerticalVolumePanelContent.kt

+7 −6

Original line number	Diff line number	Diff line
		@@ -37,19 +37,20 @@ fun VolumePanelComposeScope.VerticalVolumePanelContent(
		layout: ComponentsLayout,
		modifier: Modifier = Modifier,
		) {
		Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(20.dp)) {
		Column(
		modifier = modifier.verticalScroll(rememberScrollState()),
		verticalArrangement = Arrangement.spacedBy(20.dp),
		) {
		for (component in layout.headerComponents) {
		AnimatedVisibility(component.isVisible) {
		with(component.component as ComposeVolumePanelUiComponent) { Content(Modifier) }
		}
		}
		Column(Modifier.verticalScroll(rememberScrollState())) {
		for (component in layout.contentComponents) {
		AnimatedVisibility(component.isVisible) {
		with(component.component as ComposeVolumePanelUiComponent) { Content(Modifier) }
		}
		}
		}

		AnimatedContent(
		targetState = layout.footerComponents,