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

Commit 508fbbff authored by James O'Leary's avatar James O'Leary Committed by Android (Google) Code Review
Browse files

Merge "Separate color into app color and dot color; specify dot color" into tm-dev

parents a54d1ab2 1557ba37

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

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { 
                : null;

        super.applyFromWorkspaceItem(info, animate, staggerIndex);

        int oldPlateColor = mPlateColor;

        int newPlateColor = ColorUtils.setAlphaComponent(mDotParams.color, 200);

        int newPlateColor = ColorUtils.setAlphaComponent(mDotParams.appColor, 200);

        if (!animate) {

            mPlateColor = newPlateColor;

        }

src/com/android/launcher3/BubbleTextView.java

+5 −2
Original line number Diff line number Diff line
@@ -253,7 +253,8 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
     */

    public void reset() {

        mDotInfo = null;

        mDotParams.color = Color.TRANSPARENT;

        mDotParams.dotColor = Color.TRANSPARENT;

        mDotParams.appColor = Color.TRANSPARENT;

        cancelDotScaleAnim();

        mDotParams.scale = 0f;

        mForceHideDot = false;
@@ -381,7 +382,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
            flags |= FLAG_NO_BADGE;

        }

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

        mDotParams.color = iconDrawable.getIconColor();

        mDotParams.appColor = iconDrawable.getIconColor();

        mDotParams.dotColor = getContext().getResources()

                .getColor(android.R.color.system_accent3_100, getContext().getTheme());

        setIcon(iconDrawable);

        applyLabel(info);

    }

src/com/android/launcher3/folder/FolderIcon.java

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel 


            // If we are animating to the accepting state, animate the dot out.

            mDotParams.scale = Math.max(0, mDotScale - mBackground.getScaleProgress());

            mDotParams.color = mBackground.getDotColor();

            mDotParams.dotColor = mBackground.getDotColor();

            mDotRenderer.draw(canvas, mDotParams);

        }

    }