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

Merge "Fix aliasing issue with bubble badge bitmap" into rvc-qpr-dev am: 4c1d6159a1

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

Change-Id: I31f8c8bfa5e6cc815a0935038a73e1b0f572579c
This commit is contained in:
Lyn Han
2020-07-09 20:44:56 +00:00
committed by Automerger Merge Worker
parent 235d92ebfd 4c1d6159a1
commit cbd1c8e6be
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ 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.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;
@@ -95,9 +94,16 @@ public class BubbleIconFactory extends BaseIconFactory {
Bitmap badgeAndRing = Bitmap.createBitmap(userBadgedBitmap.getWidth(), Bitmap badgeAndRing = Bitmap.createBitmap(userBadgedBitmap.getWidth(),
userBadgedBitmap.getHeight(), userBadgedBitmap.getConfig()); userBadgedBitmap.getHeight(), userBadgedBitmap.getConfig());
Canvas c = new Canvas(badgeAndRing); Canvas c = new Canvas(badgeAndRing);
Rect dest = new Rect((int) ringStrokeWidth, (int) ringStrokeWidth,
c.getHeight() - (int) ringStrokeWidth, c.getWidth() - (int) ringStrokeWidth); final int bitmapTop = (int) ringStrokeWidth;
c.drawBitmap(userBadgedBitmap, null, dest, null); final int bitmapLeft = (int) ringStrokeWidth;
final int bitmapWidth = c.getWidth() - 2 * (int) ringStrokeWidth;
final int bitmapHeight = c.getHeight() - 2 * (int) ringStrokeWidth;
Bitmap scaledBitmap = Bitmap.createScaledBitmap(userBadgedBitmap, bitmapWidth,
bitmapHeight, /* filter */ true);
c.drawBitmap(scaledBitmap, bitmapTop, bitmapLeft, /* paint */null);
Paint ringPaint = new Paint(); Paint ringPaint = new Paint();
ringPaint.setStyle(Paint.Style.STROKE); ringPaint.setStyle(Paint.Style.STROKE);
ringPaint.setColor(importantConversationColor); ringPaint.setColor(importantConversationColor);
@@ -105,6 +111,7 @@ public class BubbleIconFactory extends BaseIconFactory {
ringPaint.setStrokeWidth(ringStrokeWidth); ringPaint.setStrokeWidth(ringStrokeWidth);
c.drawCircle(c.getWidth() / 2, c.getHeight() / 2, c.getWidth() / 2 - ringStrokeWidth, c.drawCircle(c.getWidth() / 2, c.getHeight() / 2, c.getWidth() / 2 - ringStrokeWidth,
ringPaint); ringPaint);
shadowGenerator.recreateIcon(Bitmap.createBitmap(badgeAndRing), c); shadowGenerator.recreateIcon(Bitmap.createBitmap(badgeAndRing), c);
return createIconBitmap(badgeAndRing); return createIconBitmap(badgeAndRing);
} }