diff options
| author | Jeff Arneson <jarneson@google.com> | 2015-03-27 15:32:06 -0700 |
|---|---|---|
| committer | Jeff Arneson <jarneson@google.com> | 2015-03-31 19:11:41 +0000 |
| commit | 6c46e0bfe42f5ddfc3aa8ece645b4b244ced3a48 (patch) | |
| tree | 338c50cede79d5b7841bcf46c2834e055a48f76b /tools/droiddoc/templates-sdk | |
| parent | 1ded630dec3ea9450c702d7250f0807af7c47cbb (diff) | |
| download | replicant_build-6c46e0bfe42f5ddfc3aa8ece645b4b244ced3a48.zip replicant_build-6c46e0bfe42f5ddfc3aa8ece645b4b244ced3a48.tar.gz replicant_build-6c46e0bfe42f5ddfc3aa8ece645b4b244ced3a48.tar.bz2 | |
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
Diffstat (limited to 'tools/droiddoc/templates-sdk')
| -rw-r--r-- | tools/droiddoc/templates-sdk/class.cs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tools/droiddoc/templates-sdk/class.cs b/tools/droiddoc/templates-sdk/class.cs index 7aa99f9..693eaed 100644 --- a/tools/droiddoc/templates-sdk/class.cs +++ b/tools/droiddoc/templates-sdk/class.cs @@ -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,12 +198,12 @@ 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) ?> - <div class="jd-descrdiv"> - <?cs call:short_descr(method) ?> - <?cs call:show_annotations_list(method) ?> - </div> - <?cs /if ?> + <?cs if:subcount(method.shortDescr) || subcount(method.deprecated) || subcount(method.showAnnotations) ?> + <div class="jd-descrdiv"> + <?cs if:subcount(method.shortDescr) || subcount(method.annotationdocumentation) ?><?cs call:short_descr(method)?><?cs /if?> + <?cs call:show_annotations_list(method) ?> + </div> + <?cs /if ?> </td></tr> <?cs set:count = count + #1 ?> <?cs /each ?> |