Merge "[flexiglass] Ignore window insets in scene container root, and adjust... (6e59843c) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.Spacer
		import androidx.compose.foundation.layout.WindowInsets
		import androidx.compose.foundation.layout.asPaddingValues
		import androidx.compose.foundation.layout.displayCutoutPadding
		import androidx.compose.foundation.layout.fillMaxHeight
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.fillMaxWidth
		@@ -68,6 +69,8 @@ import com.android.compose.animation.scene.animateSceneFloatAsState
		import com.android.compose.modifiers.thenIf
		import com.android.compose.windowsizeclass.LocalWindowSizeClass
		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.LocalRawScreenHeight
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.dagger.SysUISingleton
		@@ -152,6 +155,8 @@ private fun SceneScope.QuickSettingsScene(
		modifier: Modifier = Modifier,
		shadeSession: SaveableSession,
		) {
		val cutoutLocation = LocalDisplayCutout.current.location

		val brightnessMirrorShowing by viewModel.brightnessMirrorViewModel.isShowing.collectAsState()
		val contentAlpha by
		animateFloatAsState(
		@@ -183,6 +188,9 @@ private fun SceneScope.QuickSettingsScene(
		// scene (and not the one under it) during a scene transition.
		Modifier.graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)
		}
		.thenIf(cutoutLocation != CutoutLocation.CENTER) {
		Modifier.displayCutoutPadding()
		},
		) {
		val isCustomizing by viewModel.qsSceneAdapter.isCustomizing.collectAsState()
		val isCustomizerShowing by viewModel.qsSceneAdapter.isCustomizerShowing.collectAsState()

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

+14 −3

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import androidx.compose.foundation.layout.Row
		import androidx.compose.foundation.layout.Spacer
		import androidx.compose.foundation.layout.WindowInsets
		import androidx.compose.foundation.layout.asPaddingValues
		import androidx.compose.foundation.layout.displayCutoutPadding
		import androidx.compose.foundation.layout.fillMaxHeight
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.fillMaxWidth
		@@ -67,6 +68,8 @@ import com.android.compose.animation.scene.animateSceneFloatAsState
		import com.android.compose.modifiers.padding
		import com.android.compose.modifiers.thenIf
		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.dagger.SysUISingleton
		import com.android.systemui.media.controls.ui.composable.MediaCarousel
		@@ -208,6 +211,8 @@ private fun SceneScope.SingleShade(
		modifier: Modifier = Modifier,
		shadeSession: SaveableSession,
		) {
		val cutoutLocation = LocalDisplayCutout.current.location

		val maxNotifScrimTop = remember { mutableStateOf(0f) }
		val tileSquishiness by
		animateSceneFloatAsState(
		@@ -243,9 +248,15 @@ private fun SceneScope.SingleShade(
		Column(
		horizontalAlignment = Alignment.CenterHorizontally,
		modifier =
		Modifier.fillMaxWidth().thenIf(isClickable) {
		Modifier.clickable(onClick = { viewModel.onContentClicked() })
		Modifier.fillMaxWidth()
		.thenIf(isClickable) {
		Modifier.clickable(
		onClick = { viewModel.onContentClicked() }
		)
		}
		.thenIf(cutoutLocation != CutoutLocation.CENTER) {
		Modifier.displayCutoutPadding()
		},
		) {
		CollapsedShadeHeader(
		viewModel = viewModel.shadeHeaderViewModel,

packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt

+3 −4

Original line number	Diff line number	Diff line
		@@ -56,9 +56,8 @@ class SceneWindowRootView(
		}

		// TODO(b/298525212): remove once Compose exposes window inset bounds.
		override fun onApplyWindowInsets(windowInsets: WindowInsets): WindowInsets? {
		val insets = super.onApplyWindowInsets(windowInsets)
		this.windowInsets.value = insets
		return insets
		override fun onApplyWindowInsets(windowInsets: WindowInsets): WindowInsets {
		this.windowInsets.value = windowInsets
		return windowInsets
		}
		}