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

Commit f80b5f50 authored by Jon Miranda's avatar Jon Miranda
Browse files

Only draw transient taskbar background for transient taskbar 

Bug: 252905206
Fix: 255925607
Test: disable flag, view taskbar
Change-Id: I1734fa238e3c07f5da6a03659c1079eb1b6b7277
parent 661f38cd

quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt

+4 −2
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ class TaskbarBackgroundRenderer(context: TaskbarActivityContext) { 
    private var maxBackgroundHeight = context.deviceProfile.taskbarSize.toFloat()

    private val transientBackgroundBounds = context.transientTaskbarBounds



    private val isTransientTaskbar = DisplayController.isTransientTaskbar(context);



    private var shadowBlur = 0f

    private var keyShadowDistance = 0f

    private var bottomMargin = 0
@@ -52,7 +54,7 @@ class TaskbarBackgroundRenderer(context: TaskbarActivityContext) { 
        paint.flags = Paint.ANTI_ALIAS_FLAG

        paint.style = Paint.Style.FILL



        if (DisplayController.isTransientTaskbar(context)) {

        if (isTransientTaskbar) {

            paint.color = context.getColor(R.color.transient_taskbar_background)



            val res = context.resources
@@ -81,7 +83,7 @@ class TaskbarBackgroundRenderer(context: TaskbarActivityContext) { 
    fun draw(canvas: Canvas) {

        canvas.save()

        canvas.translate(0f, canvas.height - backgroundHeight - bottomMargin)

        if (transientBackgroundBounds.isEmpty) {

        if (!isTransientTaskbar || transientBackgroundBounds.isEmpty) {

            // Draw the background behind taskbar content.

            canvas.drawRect(0f, 0f, canvas.width.toFloat(), backgroundHeight, paint)