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

Merge "Fix drawing the ring around adaptive app icons" into tm-qpr-dev

Browse Source
This commit is contained in:
Mady Mellor
2022-12-09 17:48:57 +00:00
committed by Android (Google) Code Review
parent 5aad6ff53d 0c1dd96b1f
commit 37e943894d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleBadgeIconFactory.java
View File

@@ -19,7 +19,6 @@ package com.android.wm.shell.bubbles;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Path; import android.graphics.Path;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.AdaptiveIconDrawable; import android.graphics.drawable.AdaptiveIconDrawable;
@@ -59,7 +58,8 @@ public class BubbleBadgeIconFactory extends BaseIconFactory {
private class CircularRingDrawable extends CircularAdaptiveIcon { private class CircularRingDrawable extends CircularAdaptiveIcon {
final int mImportantConversationColor; final int mImportantConversationColor;
final Rect mTempBounds = new Rect(); final int mRingWidth;
final Rect mInnerBounds = new Rect();
final Drawable mDr; final Drawable mDr;
@@ -68,6 +68,8 @@ public class BubbleBadgeIconFactory extends BaseIconFactory {
mDr = dr; mDr = dr;
mImportantConversationColor = mContext.getResources().getColor( mImportantConversationColor = mContext.getResources().getColor(
R.color.important_conversation, null); R.color.important_conversation, null);
mRingWidth = mContext.getResources().getDimensionPixelSize(
com.android.internal.R.dimen.importance_ring_stroke_width);
} }
@Override @Override
@@ -75,11 +77,10 @@ public class BubbleBadgeIconFactory extends BaseIconFactory {
int save = canvas.save(); int save = canvas.save();
canvas.clipPath(getIconMask()); canvas.clipPath(getIconMask());
canvas.drawColor(mImportantConversationColor); canvas.drawColor(mImportantConversationColor);
int ringStrokeWidth = mContext.getResources().getDimensionPixelSize( mInnerBounds.set(getBounds());
com.android.internal.R.dimen.importance_ring_stroke_width); mInnerBounds.inset(mRingWidth, mRingWidth);
mTempBounds.set(getBounds()); canvas.translate(mInnerBounds.left, mInnerBounds.top);
mTempBounds.inset(ringStrokeWidth, ringStrokeWidth); mDr.setBounds(0, 0, mInnerBounds.width(), mInnerBounds.height());
mDr.setBounds(mTempBounds);
mDr.draw(canvas); mDr.draw(canvas);
canvas.restoreToCount(save); canvas.restoreToCount(save);
} }
@@ -106,7 +107,6 @@ public class BubbleBadgeIconFactory extends BaseIconFactory {
int save = canvas.save(); int save = canvas.save();
canvas.clipPath(getIconMask()); canvas.clipPath(getIconMask());
canvas.drawColor(Color.BLACK);
Drawable d; Drawable d;
if ((d = getBackground()) != null) { if ((d = getBackground()) != null) {
d.draw(canvas); d.draw(canvas);