From f80b5f50a36180222f8ed3fff6cf39c20016075e Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Wed, 26 Oct 2022 10:05:09 -0700
Subject: [PATCH] Only draw transient taskbar background for transient taskbar

Bug: 252905206
Fix: 255925607
Test: disable flag, view taskbar
Change-Id: I1734fa238e3c07f5da6a03659c1079eb1b6b7277
---
 .../android/launcher3/taskbar/TaskbarBackgroundRenderer.kt  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
index d0e2b22c19..abd467d8a4 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
@@ -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)