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

Commit 6275b0ae authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Fixing flakiness in shape detection 

The shape detection logic was setting a transform on the mask path, which
overrides the original transform set by the drawable, which causes it
to give different transforms depending on how many times the method is called.

Bug: 77875383
Change-Id: I3054b8f48ba698a6c7866ed27e1129665b79c447
parent 955a018d

src/com/android/launcher3/graphics/IconNormalizer.java

+5 −3
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ public class IconNormalizer { 
    private final float[] mLeftBorder;

    private final float[] mRightBorder;

    private final Rect mBounds;

    private final Path mShapePath;

    private final Matrix mMatrix;



    private final Paint mPaintIcon;
@@ -116,6 +117,7 @@ public class IconNormalizer { 
        mPaintMaskShapeOutline.setColor(Color.BLACK);

        mPaintMaskShapeOutline.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OUT));



        mShapePath = new Path();

        mMatrix = new Matrix();

        mAdaptiveIconScale = SCALE_NOT_INITIALIZED;

    }
@@ -146,13 +148,13 @@ public class IconNormalizer { 
        mMatrix.reset();

        mMatrix.setScale(mBounds.width(), mBounds.height());

        mMatrix.postTranslate(mBounds.left, mBounds.top);

        maskPath.transform(mMatrix);

        maskPath.transform(mMatrix, mShapePath);



        // XOR operation

        mCanvasARGB.drawPath(maskPath, mPaintMaskShape);

        mCanvasARGB.drawPath(mShapePath, mPaintMaskShape);



        // DST_OUT operation around the mask path outline

        mCanvasARGB.drawPath(maskPath, mPaintMaskShapeOutline);

        mCanvasARGB.drawPath(mShapePath, mPaintMaskShapeOutline);



        // Check if the result is almost transparent

        return isTransparentBitmap(mBitmapARGB);