Merge "Fix QS OpenPanel in split shade" into main (6e99c056) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,6 @@ fun FooterActions(
		val horizontalPadding = dimensionResource(R.dimen.qs_content_horizontal_padding)
		Row(
		modifier
		.sysuiResTag("qs_footer_actions")
		.fillMaxWidth()
		.graphicsLayer { this.alpha = alpha }
		.then(backgroundModifier)

+4 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.compose.animation.scene.SceneScope
		import com.android.compose.animation.scene.TransitionState
		import com.android.compose.animation.scene.ValueKey
		import com.android.compose.modifiers.thenIf
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.qs.ui.adapter.QSSceneAdapter
		import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Companion.Collapsing
		import com.android.systemui.qs.ui.adapter.QSSceneAdapter.State.Expanding
		@@ -143,7 +144,9 @@ fun SceneScope.QuickSettings(
		MovableElement(
		key = QuickSettings.Elements.Content,
		modifier =
		modifier.fillMaxWidth().layout { measurable, constraints ->
		modifier.sysuiResTag("quick_settings_panel").fillMaxWidth().layout {
		measurable,
		constraints ->
		val placeable = measurable.measure(constraints)
		// Use the height of the correct view based on the scene it is being composed in
		val height = heightProvider().coerceAtLeast(0)

+3 −2

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ private fun SceneScope.QuickSettingsScene(
		viewModel.qsSceneAdapter,
		{ viewModel.qsSceneAdapter.qsHeight },
		isSplitShade = false,
		modifier = Modifier.sysuiResTag("quick_settings_panel")
		modifier = Modifier
		)

		val isMediaVisible by viewModel.isMediaVisible.collectAsStateWithLifecycle()
		@@ -364,7 +364,8 @@ private fun SceneScope.QuickSettingsScene(
		isCustomizing = isCustomizing,
		customizingAnimationDuration = customizingAnimationDuration,
		lifecycleOwner = lifecycleOwner,
		modifier = Modifier.align(Alignment.CenterHorizontally),
		modifier =
		Modifier.align(Alignment.CenterHorizontally).sysuiResTag("qs_footer_actions"),
		)
		}
		NotificationScrollingStack(

+3 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ import com.android.systemui.battery.BatteryMeterViewController
		import com.android.systemui.common.ui.compose.windowinsets.CutoutLocation
		import com.android.systemui.common.ui.compose.windowinsets.LocalDisplayCutout
		import com.android.systemui.common.ui.compose.windowinsets.LocalScreenCornerRadius
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.media.controls.ui.composable.MediaCarousel
		import com.android.systemui.media.controls.ui.controller.MediaCarouselController
		@@ -446,6 +447,7 @@ private fun SceneScope.SplitShade(
		Column(
		modifier =
		Modifier.fillMaxSize()
		.sysuiResTag("expanded_qs_scroll_view")
		.weight(1f)
		.thenIf(!isCustomizerShowing) {
		Modifier.verticalNestedScrollToScene()
		@@ -484,6 +486,7 @@ private fun SceneScope.SplitShade(
		lifecycleOwner = lifecycleOwner,
		modifier =
		Modifier.align(Alignment.CenterHorizontally)
		.sysuiResTag("qs_footer_actions")
		.then(brightnessMirrorShowingModifier),
		)
		}