diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 3bc0f6df7a..74ec7ee327 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -55,7 +55,6 @@ import com.android.launcher3.accessibility.BaseAccessibilityDelegate; import com.android.launcher3.dot.DotInfo; import com.android.launcher3.dragndrop.DraggableView; import com.android.launcher3.folder.FolderIcon; -import com.android.launcher3.graphics.IconPalette; import com.android.launcher3.graphics.IconShape; import com.android.launcher3.graphics.PreloadIconDrawable; import com.android.launcher3.icons.DotRenderer; @@ -378,8 +377,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, flags |= FLAG_NO_BADGE; } FastBitmapDrawable iconDrawable = info.newIcon(getContext(), flags); - mDotParams.color = IconPalette.getMutedColor(iconDrawable.getIconColor(), 0.54f); - + mDotParams.color = iconDrawable.getIconColor(); setIcon(iconDrawable); applyLabel(info); } diff --git a/src/com/android/launcher3/graphics/IconPalette.java b/src/com/android/launcher3/graphics/IconPalette.java index 3d4a1001a2..778b32a863 100644 --- a/src/com/android/launcher3/graphics/IconPalette.java +++ b/src/com/android/launcher3/graphics/IconPalette.java @@ -16,18 +16,16 @@ package com.android.launcher3.graphics; -import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound; - import android.app.Notification; import android.content.Context; import android.graphics.Color; import android.util.Log; +import androidx.core.graphics.ColorUtils; + import com.android.launcher3.R; import com.android.launcher3.util.Themes; -import androidx.core.graphics.ColorUtils; - /** * Contains colors based on the dominant color of an icon. */ @@ -147,9 +145,4 @@ public class IconPalette { } return ColorUtils.LABToColor(low, a, b); } - - public static int getMutedColor(int color, float whiteScrimAlpha) { - int whiteScrim = setColorAlphaBound(Color.WHITE, (int) (255 * whiteScrimAlpha)); - return ColorUtils.compositeColors(whiteScrim, color); - } }