Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85b3e835 authored by Shawn Lee's avatar Shawn Lee
Browse files

[flexiglass] Ignore window insets in scene container root, and adjust Shade/QS layouts accordingly 

Scene Container root no longer applies window insets to children, and leaves it up to individual scenes to consume them. Landscape shade work should be considered done after this lands.

Bug: 324113487
Bug: 335828150
Test: Visually verified legacy windowInsets are unchanged
Test: Visually verified portrait mode single shade and split shade is unchanged
Test: Visually verified landscape mode single shade now correctly adjusts to window insets
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Change-Id: Idfc21d2b6ad31b69c50582079b61fa2e4adf2886
parent 2a1cac87

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

    }

}