From 87306bebe0b74624bdbaf78a1e2516b75144c007 Mon Sep 17 00:00:00 2001
From: Valentin Iftime <valiiftime@google.com>
Date: Fri, 5 Apr 2024 15:15:54 +0200
Subject: Enable crop to padding for StatusBarIconView

 Fixes drawing InsetDrawables such as monochrome icons that are
 used for notification autogroup summaries.

Bug: 329091967
Test: atest StatusBarIconViewTest
Test: manual
Flag: ACONFIG status_bar_monochrome_icons_fix DEVELOPMENT
Change-Id: I1aac067dca08537e0edda7cb8d56f95ef758e739
---
 packages/SystemUI/aconfig/systemui.aconfig                     | 10 ++++++++++
 .../src/com/android/systemui/statusbar/StatusBarIconView.java  |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig
index 6810aac92925..76f5912eb323 100644
--- a/packages/SystemUI/aconfig/systemui.aconfig
+++ b/packages/SystemUI/aconfig/systemui.aconfig
@@ -327,6 +327,16 @@ flag {
     }
 }
 
+flag {
+    name: "status_bar_monochrome_icons_fix"
+    namespace: "systemui"
+    description: "Fixes the status bar icon size when drawing InsetDrawables (ie. monochrome icons)"
+    bug: "329091967"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+    }
+}
+
 flag {
     name: "compose_bouncer"
     namespace: "systemui"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index bb6ee24b0ffe..f8193a4a1b93 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -57,6 +57,7 @@ import com.android.app.animation.Interpolators;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.statusbar.StatusBarIcon;
 import com.android.internal.util.ContrastColorUtil;
+import com.android.systemui.Flags;
 import com.android.systemui.res.R;
 import com.android.systemui.statusbar.notification.NotificationContentDescription;
 import com.android.systemui.statusbar.notification.NotificationDozeHelper;
@@ -208,6 +209,10 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
         initializeDecorColor();
         reloadDimens();
         maybeUpdateIconScaleDimens();
+
+        if (Flags.statusBarMonochromeIconsFix()) {
+            setCropToPadding(true);
+        }
     }
 
     /** Should always be preceded by {@link #reloadDimens()} */
-- 
cgit v1.2.3-59-g8ed1b