commit 9163f5415855f6545ee28f31d433cc4eece2f19c
author Maryam Dehaini <mdehaini@google.com> Tue Nov 19 19:00:45 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 19 19:00:45 2024 +0000
tree 09ffd52a8dcfa5330567ca3e4d125ca38be664c4
parent 74842f0c1609dc6d4cc0e6c5a971a2879ad20cf2
parent 1fbb98e057bfb52d8fff675956dd5cf6ec2e09d8

Merge "Set task corner radius to match spec" into main

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

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt
index c0e921e..ea6d82b 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.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 @@
             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)
         }
     }