Merge "Separate color into app color and dot color" into tm-dev

        mCirclePaint.setColor(Color.BLACK);

        canvas.drawBitmap(mBackgroundWithShadow, mBitmapOffset, mBitmapOffset, mCirclePaint);

        mCirclePaint.setColor(params.color);

        mCirclePaint.setColor(params.dotColor);

        canvas.drawCircle(0, 0, mCircleRadius, mCirclePaint);

        canvas.restore();

    }

    public static class DrawParams {

        /** The color (possibly based on the icon) to use for the dot. */

        @ViewDebug.ExportedProperty(category = "notification dot", formatToHexString = true)

        public int color;

        public int dotColor;

        /** The color (possibly based on the icon) to use for a predicted app. */

        @ViewDebug.ExportedProperty(category = "notification dot", formatToHexString = true)

        public int appColor;

        /** The bounds of the icon that the dot is drawn on top of. */

        @ViewDebug.ExportedProperty(category = "notification dot")

        public Rect iconBounds = new Rect();