commit 4a3aa354b83f1eb055b3240e8744e4f85c9196c0
author Sihua Ma <sihua@google.com> Thu Jan 16 22:20:16 2025 +0000
committer Sihua Ma <sihua@google.com> Thu Jan 16 16:39:56 2025 -0800
tree ae1f7114cc0a270c927377b4a60b8ff4acfa25c5
parent 31522e87977cc7778f40e664fd995e77fd7308a1

Fix work badge theme issue

The work badges are being themed even though themed icon is disabled

Test: Manual
Bug: 390031380
Flag: EXEMPT bug fix
Change-Id: Ia25a58631d416face0bd1ca2e5f086324b579834

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 9aa06bf..afc7b2e 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -75,6 +75,7 @@
 import com.android.launcher3.folder.FolderIcon;
 import com.android.launcher3.graphics.IconShape;
 import com.android.launcher3.graphics.PreloadIconDrawable;
+import com.android.launcher3.graphics.ThemeManager;
 import com.android.launcher3.icons.DotRenderer;
 import com.android.launcher3.icons.FastBitmapDrawable;
 import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
@@ -448,7 +449,9 @@
     @VisibleForTesting
     @UiThread
     public void applyIconAndLabel(ItemInfoWithIcon info) {
-        int flags = shouldUseTheme() ? FLAG_THEMED : 0;
+        ThemeManager themeManager = ThemeManager.INSTANCE.get(getContext());
+        int flags = (shouldUseTheme()
+                && themeManager.isMonoThemeEnabled()) ? FLAG_THEMED : 0;
         // Remove badge on icons smaller than 48dp.
         if (mHideBadge || mDisplay == DISPLAY_SEARCH_RESULT_SMALL) {
             flags |= FLAG_NO_BADGE;