From a76428792fedb33d0a67ea52f0300677cee103a5 Mon Sep 17 00:00:00 2001
From: Omari Stephens <xsdg@android.com>
Date: Fri, 5 Jun 2015 18:12:26 -0700
Subject: [PATCH] Add the ability to display annotations in the generated docs
 (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20

---
 tools/droiddoc/templates-sac/assets/css/default.css | 4 ++++
 tools/droiddoc/templates-sac/class.cs               | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/droiddoc/templates-sac/assets/css/default.css b/tools/droiddoc/templates-sac/assets/css/default.css
index ca998f15c..f5dd62419 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 0461af629..4003ff5c8 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 ?>