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

Commit 4ec5c60a authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Rewrite the clip modifier again. 

There seems to be a bug regarding recording graphic layers and
AnimatedContent. b/384693912.

Avoid that by using regular offscreen clipping, but optimize a bit for
not clipping when the rect to clip is empty.

Test: manual, clip and edit mode
Fixes: 384520541
Bug: 384693912
Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Change-Id: I1901e53057984a1138fe70477a19d8a300ca9f16
parent 0ef5fe0f

packages/SystemUI/src/com/android/systemui/qs/composefragment/ui/NotificationScrimClip.kt

+8 −11
Original line number Diff line number Diff line
@@ -17,16 +17,16 @@ 
package com.android.systemui.qs.composefragment.ui



import androidx.compose.ui.Modifier

import androidx.compose.ui.draw.drawWithCache

import androidx.compose.ui.draw.drawWithContent

import androidx.compose.ui.geometry.CornerRadius

import androidx.compose.ui.geometry.Offset

import androidx.compose.ui.geometry.Size

import androidx.compose.ui.graphics.BlendMode

import androidx.compose.ui.graphics.ClipOp

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.CompositingStrategy

import androidx.compose.ui.graphics.drawscope.clipRect

import androidx.compose.ui.graphics.layer.CompositingStrategy

import androidx.compose.ui.graphics.layer.drawLayer

import androidx.compose.ui.graphics.graphicsLayer



/**

 * Clipping modifier for clipping out the notification scrim as it slides over QS. It will clip out
@@ -34,16 +34,16 @@ import androidx.compose.ui.graphics.layer.drawLayer 
 * from the QS container.

 */

fun Modifier.notificationScrimClip(clipParams: () -> NotificationScrimClipParams): Modifier {

    return this.drawWithCache {

    return this.graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen }

        .drawWithContent {

            drawContent()

            val params = clipParams()

            val left = -params.leftInset.toFloat()

            val right = size.width + params.rightInset.toFloat()

            val top = params.top.toFloat()

            val bottom = params.bottom.toFloat()

            val graphicsLayer = obtainGraphicsLayer()

            graphicsLayer.compositingStrategy = CompositingStrategy.Offscreen

            graphicsLayer.record {

                drawContent()

            val clipSize = Size(right - left, bottom - top)

            if (!clipSize.isEmpty()) {

                clipRect {

                    drawRoundRect(

                        color = Color.Black,
@@ -54,9 +54,6 @@ fun Modifier.notificationScrimClip(clipParams: () -> NotificationScrimClipParams 
                    )

                }

            }

            onDrawWithContent {

                drawLayer(graphicsLayer)

            }

        }

}