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

Commit 6a35ec73 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Fixed cutout not drawn when it's inside rounded corner rect" into tm-dev am: cc1d5178 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17166623

Change-Id: I30c02518e28deeea733161c4f6578ecab00ffac0
parents 495fe0fd cc1d5178

packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt

+5 −1
Original line number Diff line number Diff line
@@ -119,9 +119,13 @@ class ScreenDecorHwcLayer(context: Context, displayDecorationSupport: DisplayDec 
        if (useInvertedAlphaColor) {

            canvas.drawColor(bgColor)

        }



        // We may clear the color(if useInvertedAlphaColor is true) of the rounded corner rects

        // before drawing rounded corners. If the cutout happens to be inside one of these rects, it

        // will be cleared, so we have to draw rounded corners before cutout.

        drawRoundedCorners(canvas)

        // Cutouts are drawn in DisplayCutoutBaseView.onDraw()

        super.onDraw(canvas)

        drawRoundedCorners(canvas)



        debugTransparentRegionPaint?.let {

            calculateTransparentRect()