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

Commit 6c46e0bf authored by Jeff Arneson's avatar Jeff Arneson
Browse files

Show annotation documentation on class details 

Also fix a bug where showAnnotations tags weren't appearing on
symbols without a javadoc

Bug: 19427762
Bug: 19931569
Change-Id: I4de8d5682acc438da69637262d8447695d6fb975
parent 1ded630d

tools/droiddoc/templates-sdk/class.cs

+11 −9
Original line number Diff line number Diff line
@@ -169,13 +169,15 @@ Summary: 


<div class="jd-descr">

<?cs call:deprecated_warning(class) ?>

<?cs if:subcount(class.descr) ?>

<?cs if:subcount(class.descr) || subcount(class.annotationdocumentation) ?>

<h2>Class Overview</h2>

<p itemprop="articleBody"><?cs call:tag_list(class.descr) ?></p>

<?cs if:subcount(class.descr) ?><p itemprop="articleBody"><?cs call:tag_list(class.descr) ?></p><?cs /if ?>

<?cs if:subcount(class.annotationdocumentation) ?><?cs each:annodoc = class.annotationdocumentation?>

<p><?cs var:annodoc.text ?></p>

<?cs /each?><?cs /if?>

<?cs /if ?>



<?cs call:see_also_tags(class.seeAlso) ?>



</div><!-- jd-descr -->
@@ -196,9 +198,9 @@ Summary: 
        </td>

        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad"><?cs call:cond_link(method.name, toroot, method.href, included) ?></span>(<?cs call:parameter_list(method.params) ?>)</nobr>

        <?cs if:subcount(method.shortDescr) || subcount(method.deprecated) ?>

        <?cs if:subcount(method.shortDescr) || subcount(method.deprecated) || subcount(method.showAnnotations) ?>

          <div class="jd-descrdiv">

          <?cs call:short_descr(method) ?>

            <?cs if:subcount(method.shortDescr) || subcount(method.annotationdocumentation) ?><?cs call:short_descr(method)?><?cs /if?>

            <?cs call:show_annotations_list(method) ?>

          </div>

        <?cs /if ?>