diff options
| author | Clay Murphy <claym@google.com> | 2015-08-11 21:12:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 21:12:33 +0000 |
| commit | 87492b889d2d90512c1e7129e3e5d04339d9e0e2 (patch) | |
| tree | 7db6f5bf8095dc15964aab2250b50a7475f7d75d /tools | |
| parent | 112f4c07c7de4bdb28aeb150233b24e7b1463f86 (diff) | |
| parent | 86e510cc313a464870ff82a9cd7f7206ea4aeb63 (diff) | |
| download | build-87492b889d2d90512c1e7129e3e5d04339d9e0e2.zip build-87492b889d2d90512c1e7129e3e5d04339d9e0e2.tar.gz build-87492b889d2d90512c1e7129e3e5d04339d9e0e2.tar.bz2 | |
am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit '86e510cc313a464870ff82a9cd7f7206ea4aeb63':
Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/droiddoc/templates-sac/assets/css/default.css | 4 | ||||
| -rw-r--r-- | tools/droiddoc/templates-sac/class.cs | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/droiddoc/templates-sac/assets/css/default.css b/tools/droiddoc/templates-sac/assets/css/default.css index ca998f1..f5dd624 100644 --- a/tools/droiddoc/templates-sac/assets/css/default.css +++ b/tools/droiddoc/templates-sac/assets/css/default.css @@ -4555,3 +4555,7 @@ a.download-sdk { .fullpage #footer { margin-top: -40px; } + +.annotation-message { + display: block; +} diff --git a/tools/droiddoc/templates-sac/class.cs b/tools/droiddoc/templates-sac/class.cs index 0461af6..4003ff5 100644 --- a/tools/droiddoc/templates-sac/class.cs +++ b/tools/droiddoc/templates-sac/class.cs @@ -123,6 +123,7 @@ Summary: <?cs /if ?> <?cs set:colspan = colspan-1 ?> <?cs /each ?> +<?cs call:show_annotations_list(class, "<span class='annotation-message'>", "</span><span class='annotation-message'>", "</span>") ?> </div><!-- end header --> @@ -210,7 +211,10 @@ Summary: <?cs var:field.final ?> <?cs call:type_link(field.type) ?></nobr></td> <td class="jd-linkcol"><?cs call:cond_link(field.name, toroot, field.href, included) ?></td> - <td class="jd-descrcol" width="100%"><?cs call:short_descr(field) ?></td> + <td class="jd-descrcol" width="100%"><?cs call:short_descr(field) ?> + <?cs each:anno = field.showAnnotations ?> + <?cs call:show_annotations_list(field, "<span class='annotation-message'>", "</span><span class='annotation-message'>", "</span>") ?> + <?cs /each ?></td> </tr> <?cs set:count = count + #1 ?> <?cs /each ?> |