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

Commit 5fa02d5f authored by burakov's avatar burakov Committed by Danny Burakov
Browse files

[flexiglass] Do not punch hole through the lock screen content. 

Fix: 438156418
Test: Manually by opening the shade over the lock screen.
Flag: com.android.systemui.scene_container
Change-Id: Ifaa484031c20ef43416148adc5876e52941a003e
parent 55249743

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

+10 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.compose.runtime.setValue 
import androidx.compose.runtime.snapshotFlow

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
@@ -105,7 +106,6 @@ object Shade { 
    object Elements {

        val BackgroundScrim =

            ElementKey("ShadeBackgroundScrim", contentPicker = LowestZIndexContentPicker)

        val SplitShadeStartColumn = ElementKey("SplitShadeStartColumn")

    }



    object Dimensions {
@@ -266,7 +266,14 @@ private fun ContentScope.SingleShade( 
            )

        }



    Box(modifier) {

    Box(

        modifier =

            modifier.thenIf(shouldPunchHoleBehindScrim) {

                // Render the scene to an offscreen buffer so that BlendMode.DstOut only clears this

                // scene (and not the one under it) during a scene transition.

                Modifier.graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)

            }

    ) {

        ShadePanelScrim(viewModel.isTransparencyEnabled)

        Layout(

            modifier =
@@ -414,7 +421,7 @@ private fun ContentScope.SplitShade( 
            Row(modifier = Modifier.fillMaxWidth().weight(1f)) {

                Box(

                    modifier =

                        Modifier.element(QuickSettings.Elements.SplitShadeQuickSettings)

                        Modifier.element(SplitShadeQuickSettings)

                            .overscroll(verticalOverscrollEffect)

                            .weight(1f)

                            .graphicsLayer { translationX = unfoldTranslationXForStartSide }