Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47da5d62 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Using icon color for dot and halo" into sc-dev

parents a71269e3 67555872

quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java

+1 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.launcher3.DeviceProfile; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherSettings;

import com.android.launcher3.R;

import com.android.launcher3.graphics.IconPalette;

import com.android.launcher3.icons.GraphicsUtils;

import com.android.launcher3.icons.IconNormalizer;

import com.android.launcher3.icons.LauncherIcons;
@@ -112,8 +111,7 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { 
    @Override

    public void applyFromWorkspaceItem(WorkspaceItemInfo info) {

        super.applyFromWorkspaceItem(info);

        int color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);

        mPlateColor = ColorUtils.setAlphaComponent(color, 200);

        mPlateColor = ColorUtils.setAlphaComponent(mDotParams.color, 200);

        if (mIsPinned) {

            setContentDescription(info.contentDescription);

        } else {

src/com/android/launcher3/BubbleTextView.java

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
    private DotInfo mDotInfo;

    private DotRenderer mDotRenderer;

    @ViewDebug.ExportedProperty(category = "launcher", deepExport = true)

    private DotRenderer.DrawParams mDotParams;

    protected DotRenderer.DrawParams mDotParams;

    private Animator mDotScaleAnim;

    private boolean mForceHideDot;
@@ -319,7 +319,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
    protected void applyIconAndLabel(ItemInfoWithIcon info) {

        boolean useTheme = mDisplay == DISPLAY_WORKSPACE || mDisplay == DISPLAY_FOLDER;

        FastBitmapDrawable iconDrawable = info.newIcon(getContext(), useTheme);

        mDotParams.color = IconPalette.getMutedColor(info.bitmap.color, 0.54f);

        mDotParams.color = IconPalette.getMutedColor(iconDrawable.getIconColor(), 0.54f);



        setIcon(iconDrawable);

        applyLabel(info);