am 2d20e3d9: DO NOT MERGE Revert "Add the ability to display annotations in the generated docs"
* commit '2d20e3d9680757109981d66c25976fa66b46ac81':
DO NOT MERGE Revert "Add the ability to display annotations in the generated docs"
diff --git a/tools/droiddoc/templates-sac/assets/css/default.css b/tools/droiddoc/templates-sac/assets/css/default.css
index a44f467..c8bd5b5 100644
--- a/tools/droiddoc/templates-sac/assets/css/default.css
+++ b/tools/droiddoc/templates-sac/assets/css/default.css
@@ -4564,7 +4564,3 @@
.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 4003ff5..0461af6 100644
--- a/tools/droiddoc/templates-sac/class.cs
+++ b/tools/droiddoc/templates-sac/class.cs
@@ -123,7 +123,6 @@
<?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 -->
@@ -211,10 +210,7 @@
<?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) ?>
- <?cs each:anno = field.showAnnotations ?>
- <?cs call:show_annotations_list(field, "<span class='annotation-message'>", "</span><span class='annotation-message'>", "</span>") ?>
- <?cs /each ?></td>
+ <td class="jd-descrcol" width="100%"><?cs call:short_descr(field) ?></td>
</tr>
<?cs set:count = count + #1 ?>
<?cs /each ?>