Merge "[Flexiglass] QQS/QS Media in landscape" into main (c445536d) · Commits · e / os / android_frameworks_base

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

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.qs.ui.composable

		import androidx.compose.ui.layout.Measurable
		import androidx.compose.ui.layout.MeasurePolicy
		import androidx.compose.ui.layout.MeasureResult
		import androidx.compose.ui.layout.MeasureScope
		import androidx.compose.ui.layout.layoutId
		import androidx.compose.ui.unit.Constraints
		import androidx.compose.ui.unit.Density
		import androidx.compose.ui.util.fastFirst
		import kotlin.math.max

		/*
		This layout puts QS taking all horizontal space and media taking the right half of the space.
		However, QS (in QSPanel) puts an empty view taking half the horizontal space so that it can be
		covered by media.
		*/
		class QSMediaMeasurePolicy(
		val qsHeight: () -> Int,
		val mediaVerticalOffset: Density.() -> Int = { 0 },
		) : MeasurePolicy {
		override fun MeasureScope.measure(
		measurables: List<Measurable>,
		constraints: Constraints
		): MeasureResult {
		val qsMeasurable = measurables.fastFirst { it.layoutId == LayoutId.QS }
		val mediaMeasurable = measurables.fastFirst { it.layoutId == LayoutId.Media }

		val qsPlaceable = qsMeasurable.measure(constraints)
		val mediaPlaceable =
		mediaMeasurable.measure(constraints.copy(maxWidth = constraints.maxWidth / 2))

		val width = qsPlaceable.width
		val height = max(qsHeight(), mediaPlaceable.height)
		return layout(width, height) {
		qsPlaceable.placeRelative(0, 0)
		mediaPlaceable.placeRelative(width / 2, mediaVerticalOffset())
		}
		}

		enum class LayoutId {
		QS,
		Media,
		}
		}

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier
		import androidx.compose.ui.draw.drawWithContent
		import androidx.compose.ui.layout.layout
		import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.unit.dp
		import androidx.compose.ui.viewinterop.AndroidView
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.compose.animation.scene.ElementKey
		@@ -62,11 +63,21 @@ object QuickSettings {

		object SharedValues {
		val TilesSquishiness = ValueKey("QuickSettingsTileSquishiness")

		object SquishinessValues {
		val Default = 1f
		val LockscreenSceneStarting = 0f
		val GoneSceneStarting = 0.3f
		}

		val MediaLandscapeTopOffset = ValueKey("MediaLandscapeTopOffset")

		object MediaOffset {
		val InQQS = 0.dp
		// Brightness + padding
		val InQS = 92.dp
		val Default = 0.dp
		}
		}
		}

		@@ -77,8 +88,8 @@ private fun SceneScope.stateForQuickSettingsContent(
		return when (val transitionState = layoutState.transitionState) {
		is TransitionState.Idle -> {
		when (transitionState.currentScene) {
		Scenes.Shade -> QSSceneAdapter.State.QQS.takeUnless { isSplitShade }
		?: QSSceneAdapter.State.QS
		Scenes.Shade ->
		QSSceneAdapter.State.QQS.takeUnless { isSplitShade } ?: QSSceneAdapter.State.QS
		Scenes.QuickSettings -> QSSceneAdapter.State.QS
		else -> QSSceneAdapter.State.CLOSED
		}

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

+44 −14

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import androidx.compose.foundation.layout.padding
		import androidx.compose.foundation.layout.wrapContentHeight
		import androidx.compose.foundation.rememberScrollState
		import androidx.compose.foundation.verticalScroll
		import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
		import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.DisposableEffect
		@@ -56,6 +57,8 @@ import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.CompositingStrategy
		import androidx.compose.ui.graphics.graphicsLayer
		import androidx.compose.ui.layout.Layout
		import androidx.compose.ui.layout.layoutId
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.platform.LocalLifecycleOwner
		import androidx.compose.ui.res.colorResource
		@@ -63,6 +66,7 @@ import androidx.compose.ui.unit.dp
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.compose.animation.scene.SceneScope
		import com.android.compose.animation.scene.TransitionState
		import com.android.compose.animation.scene.animateSceneDpAsState
		import com.android.compose.animation.scene.animateSceneFloatAsState
		import com.android.compose.modifiers.thenIf
		import com.android.compose.windowsizeclass.LocalWindowSizeClass
		@@ -79,6 +83,8 @@ import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.media.dagger.MediaModule
		import com.android.systemui.notifications.ui.composable.HeadsUpNotificationSpace
		import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility
		import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaLandscapeTopOffset
		import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaOffset.InQS
		import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneViewModel
		import com.android.systemui.res.R
		import com.android.systemui.scene.session.ui.composable.SaveableSession
		@@ -258,6 +264,14 @@ private fun SceneScope.QuickSettingsScene(
		}
		}

		// ############# Media ###############
		val isMediaVisible by viewModel.isMediaVisible.collectAsStateWithLifecycle()
		val mediaInRow =
		isMediaVisible &&
		LocalWindowSizeClass.current.heightSizeClass == WindowHeightSizeClass.Compact
		val mediaOffset by
		animateSceneDpAsState(value = InQS, key = MediaLandscapeTopOffset, canOverflow = false)

		// This is the background for the whole scene, as the elements don't necessarily provide
		// a background that extends to the edges.
		Spacer(
		@@ -337,22 +351,38 @@ private fun SceneScope.QuickSettingsScene(
		}
		Spacer(modifier = Modifier.height(16.dp))
		// This view has its own horizontal padding
		val content: @Composable () -> Unit = {
		QuickSettings(
		viewModel.qsSceneAdapter,
		{ viewModel.qsSceneAdapter.qsHeight },
		isSplitShade = false,
		modifier = Modifier
		modifier = Modifier.layoutId(QSMediaMeasurePolicy.LayoutId.QS)
		)

		val isMediaVisible by viewModel.isMediaVisible.collectAsStateWithLifecycle()

		MediaCarousel(
		isVisible = isMediaVisible,
		mediaHost = mediaHost,
		modifier = Modifier.fillMaxWidth(),
		modifier =
		Modifier.fillMaxWidth()
		.layoutId(QSMediaMeasurePolicy.LayoutId.Media),
		carouselController = mediaCarouselController,
		)
		}
		val landscapeQsMediaMeasurePolicy = remember {
		QSMediaMeasurePolicy(
		{ viewModel.qsSceneAdapter.qsHeight },
		{ mediaOffset.roundToPx() },
		)
		}
		if (mediaInRow) {
		Layout(
		content = content,
		measurePolicy = landscapeQsMediaMeasurePolicy,
		)
		} else {
		content()
		}
		}
		}

		FooterActionsWithAnimatedVisibility(

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/GoneScene.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -28,11 +28,14 @@ import androidx.compose.ui.unit.IntOffset
		import com.android.compose.animation.scene.SceneScope
		import com.android.compose.animation.scene.UserAction
		import com.android.compose.animation.scene.UserActionResult
		import com.android.compose.animation.scene.animateSceneDpAsState
		import com.android.compose.animation.scene.animateSceneFloatAsState
		import com.android.internal.policy.SystemBarUtils
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.notifications.ui.composable.HeadsUpNotificationSpace
		import com.android.systemui.qs.ui.composable.QuickSettings
		import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaLandscapeTopOffset
		import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaOffset.Default
		import com.android.systemui.res.R
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.ui.viewmodel.GoneSceneViewModel
		@@ -67,6 +70,7 @@ constructor(
		value = QuickSettings.SharedValues.SquishinessValues.GoneSceneStarting,
		key = QuickSettings.SharedValues.TilesSquishiness,
		)
		animateSceneDpAsState(value = Default, key = MediaLandscapeTopOffset, canOverflow = false)
		Spacer(modifier.fillMaxSize())
		HeadsUpNotificationStack(
		stackScrollView = notificationStackScrolLView.get(),

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

+24 −15

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import androidx.compose.foundation.clickable
		import androidx.compose.foundation.clipScrollableContainer
		import androidx.compose.foundation.gestures.Orientation
		import androidx.compose.foundation.layout.Arrangement
		import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.Row
		@@ -35,7 +34,6 @@ import androidx.compose.foundation.layout.displayCutoutPadding
		import androidx.compose.foundation.layout.fillMaxHeight
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.height
		import androidx.compose.foundation.layout.navigationBars
		import androidx.compose.foundation.layout.offset
		import androidx.compose.foundation.layout.padding
		@@ -54,6 +52,7 @@ import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.CompositingStrategy
		import androidx.compose.ui.graphics.graphicsLayer
		import androidx.compose.ui.layout.Layout
		import androidx.compose.ui.layout.layoutId
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.platform.LocalLifecycleOwner
		import androidx.compose.ui.res.colorResource
		@@ -65,6 +64,7 @@ import com.android.compose.animation.scene.SceneScope
		import com.android.compose.animation.scene.TransitionState
		import com.android.compose.animation.scene.UserAction
		import com.android.compose.animation.scene.UserActionResult
		import com.android.compose.animation.scene.animateSceneDpAsState
		import com.android.compose.animation.scene.animateSceneFloatAsState
		import com.android.compose.modifiers.padding
		import com.android.compose.modifiers.thenIf
		@@ -84,7 +84,10 @@ import com.android.systemui.media.dagger.MediaModule.QUICK_QS_PANEL
		import com.android.systemui.notifications.ui.composable.NotificationScrollingStack
		import com.android.systemui.qs.footer.ui.compose.FooterActionsWithAnimatedVisibility
		import com.android.systemui.qs.ui.composable.BrightnessMirror
		import com.android.systemui.qs.ui.composable.QSMediaMeasurePolicy
		import com.android.systemui.qs.ui.composable.QuickSettings
		import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaLandscapeTopOffset
		import com.android.systemui.qs.ui.composable.QuickSettings.SharedValues.MediaOffset.InQQS
		import com.android.systemui.res.R
		import com.android.systemui.scene.session.ui.composable.SaveableSession
		import com.android.systemui.scene.shared.model.Scenes
		@@ -241,6 +244,8 @@ private fun SceneScope.SingleShade(
		val mediaInRow =
		isMediaVisible &&
		LocalWindowSizeClass.current.heightSizeClass == WindowHeightSizeClass.Compact
		val mediaOffset by
		animateSceneDpAsState(value = InQQS, key = MediaLandscapeTopOffset, canOverflow = false)

		Box(
		modifier =
		@@ -281,10 +286,10 @@ private fun SceneScope.SingleShade(
		statusBarIconController = statusBarIconController,
		)

		val content: @Composable (Modifier) -> Unit = { modifier ->
		val content: @Composable () -> Unit = {
		Box(
		Modifier.element(QuickSettings.Elements.QuickQuickSettings)
		.then(modifier)
		.layoutId(QSMediaMeasurePolicy.LayoutId.QS)
		) {
		QuickSettings(
		viewModel.qsSceneAdapter,
		@@ -297,21 +302,25 @@ private fun SceneScope.SingleShade(
		MediaCarousel(
		isVisible = isMediaVisible,
		mediaHost = mediaHost,
		modifier = Modifier.fillMaxWidth().then(modifier),
		modifier =
		Modifier.fillMaxWidth()
		.layoutId(QSMediaMeasurePolicy.LayoutId.Media),
		carouselController = mediaCarouselController,
		)
		}

		if (!mediaInRow) {
		content(Modifier)
		} else {
		Row(
		modifier = Modifier.fillMaxWidth(),
		horizontalArrangement = spacedBy(16.dp),
		verticalAlignment = Alignment.CenterVertically,
		) {
		content(Modifier.weight(1f))
		val landscapeQsMediaMeasurePolicy = remember {
		QSMediaMeasurePolicy(
		{ viewModel.qsSceneAdapter.qqsHeight },
		{ mediaOffset.roundToPx() },
		)
		}
		if (mediaInRow) {
		Layout(
		content = content,
		measurePolicy = landscapeQsMediaMeasurePolicy,
		)
		} else {
		content()
		}
		}
		},