From 1fbb98e057bfb52d8fff675956dd5cf6ec2e09d8 Mon Sep 17 00:00:00 2001 From: Maryam Dehaini Date: Wed, 13 Nov 2024 11:27:31 -0800 Subject: [PATCH] Set task corner radius to match spec The task bar sets the corner radius of maximized tasks in desktop windowing. This change updates the corner radius to match the most recent spec. Bug: 369592605 Test: manual testing Flag: EXEMPT bugfix Change-Id: I87bbaaf262f30e95fe1760d2dad51a890efca4c1 --- .../launcher3/taskbar/TaskbarBackgroundRenderer.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt index c0e921edcf..ea6d82b7e2 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt @@ -23,7 +23,6 @@ import android.graphics.Paint import android.graphics.Path import android.graphics.RectF import com.android.app.animation.Interpolators -import com.android.internal.policy.ScreenDecorationsUtils import com.android.launcher3.R import com.android.launcher3.Utilities import com.android.launcher3.Utilities.mapRange @@ -98,12 +97,9 @@ class TaskbarBackgroundRenderer(private val context: TaskbarActivityContext) { shadowAlpha = LIGHT_THEME_SHADOW_ALPHA } - if (context.areDesktopTasksVisible()) { - fullCornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context) - cornerRadius = fullCornerRadius - } else { - fullCornerRadius = context.cornerRadius.toFloat() - cornerRadius = fullCornerRadius + fullCornerRadius = context.cornerRadius.toFloat() + cornerRadius = fullCornerRadius + if (!context.areDesktopTasksVisible()) { setCornerRoundness(MAX_ROUNDNESS) } }