From 96691aa2e0d08cb7b7ea0d8a15d7416ec4bf924d Mon Sep 17 00:00:00 2001 From: Jagrut Desai Date: Fri, 27 Oct 2023 13:48:28 -0700 Subject: [PATCH] Stashing Persistent Taskbar Background for ime invocation Test: Manual Bug: 308175076 Flag: LEGACY ENABLE_TASKBAR_PINNING DISABLED Change-Id: Ic1091f6493125b123fdd6210d6904f9b175897ee --- .../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 e4ebf65fbf..d6016f1304 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt @@ -32,6 +32,7 @@ import com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound import com.android.launcher3.taskbar.TaskbarPinningController.Companion.PINNING_PERSISTENT import com.android.launcher3.taskbar.TaskbarPinningController.Companion.PINNING_TRANSIENT import com.android.launcher3.util.DisplayController +import kotlin.math.min /** Helps draw the taskbar background, made up of a rectangle plus two inverted rounded corners. */ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { @@ -153,9 +154,10 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { // Draw the background behind taskbar content. canvas.drawRect(0f, 0f, canvas.width.toFloat(), persistentTaskbarHeight, paint) } else { - canvas.translate(0f, canvas.height - maxPersistentTaskbarHeight) + val persistentTaskbarHeight = min(maxPersistentTaskbarHeight, backgroundHeight) + canvas.translate(0f, canvas.height - persistentTaskbarHeight) // Draw the background behind taskbar content. - canvas.drawRect(0f, 0f, canvas.width.toFloat(), maxPersistentTaskbarHeight, paint) + canvas.drawRect(0f, 0f, canvas.width.toFloat(), persistentTaskbarHeight, paint) } // Draw the inverted rounded corners above the taskbar.