Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I36017f0591ea32bb13465776c1b6824f06f17cea
This commit is contained in:
Lucas Lin
2020-06-18 02:53:10 +00:00
committed by Automerger Merge Worker
parent 3f0f9833bf b50e81f9b8
commit c9a2afdce3
2 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/SystemUI/src/com/android/systemui/bubbles/BubbleIconFactory.java
View File

@@ -23,8 +23,6 @@ import android.content.pm.LauncherApps;
import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutInfo;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon; 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 * 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. * will include the workprofile indicator on the badge if appropriate.
*/ */
BitmapInfo getBadgeBitmap(Drawable userBadgedAppIcon, boolean isImportantConversation) { BitmapInfo getBadgeBitmap(Drawable userBadgedAppIcon) {
Bitmap userBadgedBitmap = createIconBitmap( Bitmap userBadgedBitmap = createIconBitmap(
userBadgedAppIcon, 1f, getBadgeSize()); userBadgedAppIcon, 1f, getBadgeSize());
ShadowGenerator shadowGenerator = new ShadowGenerator(getBadgeSize());
if (!isImportantConversation) {
Canvas c = new Canvas(); Canvas c = new Canvas();
ShadowGenerator shadowGenerator = new ShadowGenerator(getBadgeSize());
c.setBitmap(userBadgedBitmap); c.setBitmap(userBadgedBitmap);
shadowGenerator.recreateIcon(Bitmap.createBitmap(userBadgedBitmap), c); shadowGenerator.recreateIcon(Bitmap.createBitmap(userBadgedBitmap), c);
return createIconBitmap(userBadgedBitmap); 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);
}
} }
/** /**

5
packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java
View File

@@ -176,10 +176,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask
bubbleDrawable = appIcon; bubbleDrawable = appIcon;
} }
boolean isImportantConversation = (entry == null || entry.getChannel() == null) ? false BitmapInfo badgeBitmapInfo = iconFactory.getBadgeBitmap(badgedIcon);
: entry.getChannel().isImportantConversation();
BitmapInfo badgeBitmapInfo = iconFactory.getBadgeBitmap(badgedIcon,
isImportantConversation);
info.badgedAppIcon = badgedIcon; info.badgedAppIcon = badgedIcon;
info.badgedBubbleImage = iconFactory.getBubbleBitmap(bubbleDrawable, info.badgedBubbleImage = iconFactory.getBubbleBitmap(bubbleDrawable,
badgeBitmapInfo).icon; badgeBitmapInfo).icon;