Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shawn Lin
2022-03-15 02:14:25 +00:00
committed by Android (Google) Code Review
parent e8688b5353 b742d45a6d
commit cc1d5178d2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/ScreenDecorHwcLayer.kt
View File

@@ -119,9 +119,13 @@ class ScreenDecorHwcLayer(context: Context, displayDecorationSupport: DisplayDec
if (useInvertedAlphaColor) { if (useInvertedAlphaColor) {
canvas.drawColor(bgColor) 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() // Cutouts are drawn in DisplayCutoutBaseView.onDraw()
super.onDraw(canvas) super.onDraw(canvas)
drawRoundedCorners(canvas)
debugTransparentRegionPaint?.let { debugTransparentRegionPaint?.let {
calculateTransparentRect() calculateTransparentRect()