From 2d20e3d9680757109981d66c25976fa66b46ac81 Mon Sep 17 00:00:00 2001
From: Justin Morey <jmorey@google.com>
Date: Tue, 11 Aug 2015 18:52:59 -0500
Subject: [PATCH] DO NOT MERGE Revert "Add the ability to display annotations
 in the generated docs"

This is reverted along with ag/745924 due to GmsCore build breakage.

This reverts commit a76428792fedb33d0a67ea52f0300677cee103a5.

Change-Id: Ib66777e003cd7ab3ed056777686086e9b5d92698
---
 tools/droiddoc/templates-sac/assets/css/default.css | 4 ----
 tools/droiddoc/templates-sac/class.cs               | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/tools/droiddoc/templates-sac/assets/css/default.css b/tools/droiddoc/templates-sac/assets/css/default.css
index f5dd62419..ca998f15c 100644
--- a/tools/droiddoc/templates-sac/assets/css/default.css
+++ b/tools/droiddoc/templates-sac/assets/css/default.css
@@ -4555,7 +4555,3 @@ 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 4003ff5c8..0461af629 100644
--- a/tools/droiddoc/templates-sac/class.cs
+++ b/tools/droiddoc/templates-sac/class.cs
@@ -123,7 +123,6 @@ 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 -->
 
@@ -211,10 +210,7 @@ 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) ?>
-              <?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 ?>