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

Commit 6f1118a9 authored by Tony Wickham's avatar Tony Wickham
Browse files

Revert "Merge commit 'refs/changes/42/2374342/1' of... 

Revert "Merge commit 'refs/changes/42/2374342/1' of sso://googleplex-android/platform/packages/apps/Launcher3 into dots-color"

This reverts commit 0316c120.

Change-Id: I166af3bd287b0c9c0aad6430c0f9ec50961c8f3c
parent 0316c120

res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
    <!-- Popup container -->

    <color name="notification_icon_default_color">#757575</color> <!-- Gray 600 -->

    <color name="badge_color">#1DE9B6</color> <!-- Teal A400 -->

    <color name="folder_badge_color">#1DE9B6</color> <!-- Teal A400 -->



    <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->

    <color name="legacy_icon_background">#FFFFFF</color>

src/com/android/launcher3/BubbleTextView.java

+3 −10
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { 


    private BadgeInfo mBadgeInfo;

    private BadgeRenderer mBadgeRenderer;

    private IconPalette mBadgePalette;

    private IconPalette mIconPalette;

    private float mBadgeScale;

    private boolean mForceHideBadge;

    private Point mTempSpaceForBadgeOffset = new Point();
@@ -463,7 +463,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { 
            final int scrollX = getScrollX();

            final int scrollY = getScrollY();

            canvas.translate(scrollX, scrollY);

            mBadgeRenderer.draw(canvas, mBadgePalette, mBadgeInfo, mTempIconBounds, mBadgeScale,

            mBadgeRenderer.draw(canvas, mBadgeInfo, mTempIconBounds, mBadgeScale,

                    mTempSpaceForBadgeOffset);

            canvas.translate(-scrollX, -scrollY);

        }
@@ -597,10 +597,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { 
            float newBadgeScale = isBadged ? 1f : 0;

            mBadgeRenderer = mLauncher.getDeviceProfile().mBadgeRenderer;

            if (wasBadged || isBadged) {

                mBadgePalette = IconPalette.getBadgePalette(getResources());

                if (mBadgePalette == null) {

                    mBadgePalette = ((FastBitmapDrawable) mIcon).getIconPalette();

                }

                mIconPalette = ((FastBitmapDrawable) mIcon).getIconPalette();

                // Animate when a badge is first added or when it is removed.

                if (animate && (wasBadged ^ isBadged) && isShown()) {

                    ObjectAnimator.ofFloat(this, BADGE_SCALE_PROPERTY, newBadgeScale).start();
@@ -612,10 +609,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { 
        }

    }



    public IconPalette getBadgePalette() {

        return mBadgePalette;

    }



    /**

     * Sets the icon for this view based on the layout direction.

     */

src/com/android/launcher3/FastBitmapDrawable.java

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class FastBitmapDrawable extends Drawable { 
    public IconPalette getIconPalette() {

        if (mIconPalette == null) {

            mIconPalette = IconPalette.fromDominantColor(Utilities

                    .findDominantColorByHue(mBitmap, 20), true /* desaturateBackground */);

                    .findDominantColorByHue(mBitmap, 20));

        }

        return mIconPalette;

    }

src/com/android/launcher3/badge/BadgeRenderer.java

+8 −6
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class BadgeRenderer { 
    private final Paint mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG

            | Paint.FILTER_BITMAP_FLAG);

    private final SparseArray<Bitmap> mBackgroundsWithShadow;

    private final IconPalette mIconPalette;



    public BadgeRenderer(Context context, int iconSizePx) {

        mContext = context;
@@ -82,24 +83,25 @@ public class BadgeRenderer { 
        mTextHeight = tempTextHeight.height();



        mBackgroundsWithShadow = new SparseArray<>(3);



        mIconPalette = IconPalette.fromDominantColor(context.getColor(R.color.badge_color));

    }



    /**

     * Draw a circle in the top right corner of the given bounds, and draw

     * {@link BadgeInfo#getNotificationCount()} on top of the circle.

     * @param palette The colors (based on the icon) to use for the badge.

     * @param badgeInfo Contains data to draw on the badge. Could be null if we are animating out.

     * @param iconBounds The bounds of the icon being badged.

     * @param badgeScale The progress of the animation, from 0 to 1.

     * @param spaceForOffset How much space is available to offset the badge up and to the right.

     */

    public void draw(Canvas canvas, IconPalette palette, @Nullable BadgeInfo badgeInfo,

    public void draw(Canvas canvas, @Nullable BadgeInfo badgeInfo,

            Rect iconBounds, float badgeScale, Point spaceForOffset) {

        mTextPaint.setColor(palette.textColor);

        mTextPaint.setColor(mIconPalette.textColor);

        IconDrawer iconDrawer = badgeInfo != null && badgeInfo.isIconLarge()

                ? mLargeIconDrawer : mSmallIconDrawer;

        Shader icon = badgeInfo == null ? null : badgeInfo.getNotificationIconForBadge(

                mContext, palette.backgroundColor, mSize, iconDrawer.mPadding);

                mContext, mIconPalette.backgroundColor, mSize, iconDrawer.mPadding);

        String notificationCount = badgeInfo == null ? "0"

                : String.valueOf(badgeInfo.getNotificationCount());

        int numChars = notificationCount.length();
@@ -125,7 +127,7 @@ public class BadgeRenderer { 
        canvas.translate(badgeCenterX + offsetX, badgeCenterY - offsetY);

        canvas.scale(badgeScale, badgeScale);

        // Prepare the background and shadow and possible stacking effect.

        mBackgroundPaint.setColorFilter(palette.backgroundColorMatrixFilter);

        mBackgroundPaint.setColorFilter(mIconPalette.backgroundColorMatrixFilter);

        int backgroundWithShadowSize = backgroundWithShadow.getHeight(); // Same as width.

        boolean shouldStack = !isDot && badgeInfo != null

                && badgeInfo.getNotificationKeys().size() > 1;
@@ -147,7 +149,7 @@ public class BadgeRenderer { 
                    -backgroundWithShadowSize / 2, mBackgroundPaint);

            iconDrawer.drawIcon(icon, canvas);

        } else if (isDot) {

            mBackgroundPaint.setColorFilter(palette.saturatedBackgroundColorMatrixFilter);

            mBackgroundPaint.setColorFilter(mIconPalette.saturatedBackgroundColorMatrixFilter);

            canvas.drawBitmap(backgroundWithShadow, -backgroundWithShadowSize / 2,

                    -backgroundWithShadowSize / 2, mBackgroundPaint);

        }

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

+1 −3
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ import com.android.launcher3.config.FeatureFlags; 
import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.dragndrop.DragView;

import com.android.launcher3.util.Themes;

import com.android.launcher3.graphics.IconPalette;

import com.android.launcher3.util.Thunk;

import com.android.launcher3.widget.PendingAddShortcutInfo;
@@ -934,8 +933,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { 
            // If we are animating to the accepting state, animate the badge out.

            float badgeScale = Math.max(0, mBadgeScale - mBackground.getScaleProgress());

            mTempSpaceForBadgeOffset.set(getWidth() - mTempBounds.right, mTempBounds.top);

            IconPalette badgePalette = IconPalette.getFolderBadgePalette(getResources());

            mBadgeRenderer.draw(canvas, badgePalette, mBadgeInfo, mTempBounds,

            mBadgeRenderer.draw(canvas, mBadgeInfo, mTempBounds,

                    badgeScale, mTempSpaceForBadgeOffset);

        }

    }