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

Commit 311900a6 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

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

Merge "Fix drawing the ring around adaptive app icons" into tm-qpr-dev am: 37e94389 am: 172d20b7

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



Change-Id: Ieb0f8ecd4876c63f82f1fd169ba225fd60b19b83
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1fb88649 172d20b7

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

+8 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.bubbles; 
import android.content.Context;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.Path;

import android.graphics.Rect;

import android.graphics.drawable.AdaptiveIconDrawable;
@@ -59,7 +58,8 @@ public class BubbleBadgeIconFactory extends BaseIconFactory { 
    private class CircularRingDrawable extends CircularAdaptiveIcon {



        final int mImportantConversationColor;

        final Rect mTempBounds = new Rect();

        final int mRingWidth;

        final Rect mInnerBounds = new Rect();



        final Drawable mDr;
@@ -68,6 +68,8 @@ public class BubbleBadgeIconFactory extends BaseIconFactory { 
            mDr = dr;

            mImportantConversationColor = mContext.getResources().getColor(

                    R.color.important_conversation, null);

            mRingWidth = mContext.getResources().getDimensionPixelSize(

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

        }



        @Override
@@ -75,11 +77,10 @@ public class BubbleBadgeIconFactory extends BaseIconFactory { 
            int save = canvas.save();

            canvas.clipPath(getIconMask());

            canvas.drawColor(mImportantConversationColor);

            int ringStrokeWidth = mContext.getResources().getDimensionPixelSize(

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

            mTempBounds.set(getBounds());

            mTempBounds.inset(ringStrokeWidth, ringStrokeWidth);

            mDr.setBounds(mTempBounds);

            mInnerBounds.set(getBounds());

            mInnerBounds.inset(mRingWidth, mRingWidth);

            canvas.translate(mInnerBounds.left, mInnerBounds.top);

            mDr.setBounds(0, 0, mInnerBounds.width(), mInnerBounds.height());

            mDr.draw(canvas);

            canvas.restoreToCount(save);

        }
@@ -106,7 +107,6 @@ public class BubbleBadgeIconFactory extends BaseIconFactory { 
            int save = canvas.save();

            canvas.clipPath(getIconMask());



            canvas.drawColor(Color.BLACK);

            Drawable d;

            if ((d = getBackground()) != null) {

                d.draw(canvas);