Merge "Prevent extra brightness slider recompositions" into main (c5a7f702) · Commits · e / os / android_frameworks_base

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

+12 −9

Original line number	Diff line number	Diff line
		@@ -258,15 +258,18 @@ fun ContentScope.QuickSettingsLayout(
		modifier = Modifier.padding(horizontal = QuickSettingsShade.Dimensions.Padding),
		)

		BrightnessSliderContainer(
		viewModel = viewModel.brightnessSliderViewModel,
		containerColors = ContainerColors.singleColor(OverlayShade.Colors.PanelBackground),
		modifier =
		Box(
		Modifier.systemGestureExclusionInShade(
		enabled = { layoutState.transitionState is TransitionState.Idle }
		)
		.fillMaxWidth(),
		) {
		BrightnessSliderContainer(
		viewModel = viewModel.brightnessSliderViewModel,
		containerColors =
		ContainerColors.singleColor(OverlayShade.Colors.PanelBackground),
		modifier = Modifier.fillMaxWidth(),
		)
		}

		Box {
		GridAnchor()

+18 −16

Original line number	Diff line number	Diff line
		@@ -747,24 +747,26 @@ constructor(
		val BrightnessSlider =
		@Composable {
		AlwaysDarkMode {
		Box(
		Modifier.systemGestureExclusionInShade(
		enabled = {
		layoutState.transitionState is TransitionState.Idle
		}
		)
		) {
		BrightnessSliderContainer(
		viewModel = containerViewModel.brightnessSliderViewModel,
		viewModel =
		containerViewModel.brightnessSliderViewModel,
		containerColors =
		ContainerColors(
		Color.Transparent,
		ContainerColors.defaultContainerColor,
		),
		modifier =
		Modifier.systemGestureExclusionInShade(
		enabled = {
		layoutState.transitionState is
		TransitionState.Idle
		}
		)
		.fillMaxWidth(),
		modifier = Modifier.fillMaxWidth(),
		)
		}
		}
		}
		val TileGrid =
		@Composable {
		Box {