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

Commit 641cf595 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix the gold highlight encircles the app badge in the bubble.""... 

Merge "Revert "Fix the gold highlight encircles the app badge in the bubble."" into rvc-dev am: ccd2d93c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11898339

Change-Id: Ia4cd807558a039f24c3a3d3ae4ffb5d6731fa982
parents 68f21638 ccd2d93c

packages/SystemUI/src/com/android/systemui/bubbles/BubbleIconFactory.java

+6 −30
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.content.pm.LauncherApps; 
import android.content.pm.ShortcutInfo;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Paint;

import android.graphics.Rect;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;
@@ -78,37 +76,15 @@ public class BubbleIconFactory extends BaseIconFactory { 
     * Returns a {@link BitmapInfo} for the app-badge that is shown on top of each bubble. This

     * will include the workprofile indicator on the badge if appropriate.

     */

    BitmapInfo getBadgeBitmap(Drawable userBadgedAppIcon, boolean isImportantConversation) {

    BitmapInfo getBadgeBitmap(Drawable userBadgedAppIcon) {

        Bitmap userBadgedBitmap = createIconBitmap(

                userBadgedAppIcon, 1f, getBadgeSize());

        ShadowGenerator shadowGenerator = new ShadowGenerator(getBadgeSize());

        if (!isImportantConversation) {



        Canvas c = new Canvas();

        ShadowGenerator shadowGenerator = new ShadowGenerator(getBadgeSize());

        c.setBitmap(userBadgedBitmap);

        shadowGenerator.recreateIcon(Bitmap.createBitmap(userBadgedBitmap), c);

        return createIconBitmap(userBadgedBitmap);

        } else {

            float ringStrokeWidth = mContext.getResources().getDimensionPixelSize(

                    com.android.internal.R.dimen.importance_ring_stroke_width);

            int importantConversationColor = mContext.getResources().getColor(

                    com.android.settingslib.R.color.important_conversation, null);

            Bitmap badgeAndRing = Bitmap.createBitmap(userBadgedBitmap.getWidth(),

                    userBadgedBitmap.getHeight(), userBadgedBitmap.getConfig());

            Canvas c = new Canvas(badgeAndRing);

            Rect dest = new Rect((int) ringStrokeWidth, (int) ringStrokeWidth,

                    c.getHeight() - (int) ringStrokeWidth, c.getWidth() - (int) ringStrokeWidth);

            c.drawBitmap(userBadgedBitmap, null, dest, null);

            Paint ringPaint = new Paint();

            ringPaint.setStyle(Paint.Style.STROKE);

            ringPaint.setColor(importantConversationColor);

            ringPaint.setAntiAlias(true);

            ringPaint.setStrokeWidth(ringStrokeWidth);

            c.drawCircle(c.getWidth() / 2, c.getHeight() / 2, c.getWidth() / 2 - ringStrokeWidth,

                    ringPaint);

            shadowGenerator.recreateIcon(Bitmap.createBitmap(badgeAndRing), c);

            return createIconBitmap(badgeAndRing);

        }



    }



    /**

packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java

+1 −4
Original line number Diff line number Diff line
@@ -176,10 +176,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask 
                bubbleDrawable = appIcon;

            }



            boolean isImportantConversation = (entry == null || entry.getChannel() == null) ? false

                    : entry.getChannel().isImportantConversation();

            BitmapInfo badgeBitmapInfo = iconFactory.getBadgeBitmap(badgedIcon,

                    isImportantConversation);

            BitmapInfo badgeBitmapInfo = iconFactory.getBadgeBitmap(badgedIcon);

            info.badgedAppIcon = badgedIcon;

            info.badgedBubbleImage = iconFactory.getBubbleBitmap(bubbleDrawable,

                    badgeBitmapInfo).icon;