From c0fda71c36051ffd2a2239ad212eef0a8bde68d2 Mon Sep 17 00:00:00 2001
From: Charlie Anderson <charlander@google.com>
Date: Thu, 20 Feb 2025 17:18:14 +0000
Subject: [PATCH] Expose icon scale to properly shape themed icons

Bug: 394902299
Test: tested with themed/forced-themed icons on and off
Flag: com.android.launcher3.enable_launcher_icon_shapes
Change-Id: I5b189b8dcfefe195e42b8cfad1bda9e18fd80a29
---
 src/com/android/launcher3/icons/LauncherIcons.kt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/icons/LauncherIcons.kt b/src/com/android/launcher3/icons/LauncherIcons.kt
index 6c018e87eb..29c0de1e5a 100644
--- a/src/com/android/launcher3/icons/LauncherIcons.kt
+++ b/src/com/android/launcher3/icons/LauncherIcons.kt
@@ -66,11 +66,16 @@ internal constructor(
         return userCache.getUserInfo(user)
     }
 
-    public override fun getShapePath(drawable: AdaptiveIconDrawable, iconBounds: Rect): Path {
-        if (!Flags.enableLauncherIconShapes()) return drawable.iconMask
+    override fun getShapePath(drawable: AdaptiveIconDrawable, iconBounds: Rect): Path {
+        if (!Flags.enableLauncherIconShapes()) return super.getShapePath(drawable, iconBounds)
         return themeManager.iconShape.getPath(iconBounds)
     }
 
+    override fun getIconScale(): Float {
+        if (!Flags.enableLauncherIconShapes()) return super.getIconScale()
+        return themeManager.iconState.iconScale
+    }
+
     override fun drawAdaptiveIcon(
         canvas: Canvas,
         drawable: AdaptiveIconDrawable,