p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 540abfef: am 87492b88: am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev 

* commit '540abfef5e1a0b73b928914100842e000f8ea010':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
This commit is contained in:
Clay Murphy 2015-08-11 21:24:38 +00:00 committed by Android Git Automerger
parent 35abe70636 540abfef5e
commit 8ecce00239
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/droiddoc/templates-sac/assets/css/default.css
View File

@ -4564,3 +4564,7 @@ a.download-sdk {
.fullpage #footer { .fullpage #footer {
margin-top: -40px; margin-top: -40px;
} }
.annotation-message {
display: block;
}

6
tools/droiddoc/templates-sac/class.cs
View File

@ -123,6 +123,7 @@ Summary:
<?cs /if ?> <?cs /if ?>
<?cs set:colspan = colspan-1 ?> <?cs set:colspan = colspan-1 ?>
<?cs /each ?> <?cs /each ?>
<?cs call:show_annotations_list(class, "<span class='annotation-message'>", "</span><span class='annotation-message'>", "</span>") ?>
</div><!-- end header --> </div><!-- end header -->
@ -210,7 +211,10 @@ Summary:
<?cs var:field.final ?> <?cs var:field.final ?>
<?cs call:type_link(field.type) ?></nobr></td> <?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-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> </tr>
<?cs set:count = count + #1 ?> <?cs set:count = count + #1 ?>
<?cs /each ?> <?cs /each ?>