commit b965427554c810ac763cc90e11fd5100ff6bb0ff
author Uwais Ashraf <uwaisashraf@google.com> Fri Nov 03 12:20:27 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 03 12:20:33 2023 +0000
tree b0242949161d3149c6cd0117adf8bdbe00ae893b
parent f2b2202bd80961ff258ce82d376ecd402ec94d16

Revert "Fix the badge in badge (triple badging), by simply remov..."

Revert submission 24721954-cherrypick-removeBadgeInBadge-dia2ji7r7td

Reason for revert: Breaking tests

Reverted changes: /q/submissionid:24721954-cherrypick-removeBadgeInBadge-dia2ji7r7td

Change-Id: Ia78cbae76d52b52fdfdc258311712f44bd645f2e

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 883c379..ddcb1e6 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -22,7 +22,6 @@
 import static com.android.launcher3.config.FeatureFlags.ENABLE_ICON_LABEL_AUTO_SCALING;
 import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;
 import static com.android.launcher3.icons.BitmapInfo.FLAG_NO_BADGE;
-import static com.android.launcher3.icons.BitmapInfo.FLAG_SKIP_USER_BADGE;
 import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED;
 import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;
 import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
@@ -165,8 +164,6 @@
     @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mHideBadge = false;
     @ViewDebug.ExportedProperty(category = "launcher")
-    private boolean mSkipUserBadge = false;
-    @ViewDebug.ExportedProperty(category = "launcher")
     private boolean mIsIconVisible = true;
     @ViewDebug.ExportedProperty(category = "launcher")
     private int mTextColor;
@@ -269,10 +266,6 @@
         mHideBadge = hideBadge;
     }
 
-    public void setSkipUserBadge(boolean skipUserBadge) {
-        mSkipUserBadge = skipUserBadge;
-    }
-
     /**
      * Resets the view so it can be recycled.
      */
@@ -402,9 +395,6 @@
         if (mHideBadge || mDisplay == DISPLAY_SEARCH_RESULT_SMALL) {
             flags |= FLAG_NO_BADGE;
         }
-        if (mSkipUserBadge) {
-            flags |= FLAG_SKIP_USER_BADGE;
-        }
         FastBitmapDrawable iconDrawable = info.newIcon(getContext(), flags);
         mDotParams.appColor = iconDrawable.getIconColor();
         mDotParams.dotColor = Themes.getAttrColor(getContext(), R.attr.notificationDotColor);