Merge "Only draw transient taskbar background for transient taskbar" into tm-qpr-dev am: 0c1714bb45

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20290840

Change-Id: Ie515474f64ea8ac724cc94b946e9eb8cc86ef991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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)