Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71a33c4d authored by Clay Murphy's avatar Clay Murphy Committed by Android (Google) Code Review
Browse files

Merge "Add the ability to display annotations in the generated docs... 

Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
parents 073f74d9 a7642879

tools/droiddoc/templates-sac/assets/css/default.css

+4 −0
Original line number Diff line number Diff line
@@ -4555,3 +4555,7 @@ a.download-sdk { 
.fullpage #footer {

  margin-top: -40px;

}



.annotation-message {

  display: block;

}

tools/droiddoc/templates-sac/class.cs

+5 −1
Original line number Diff line number Diff line
@@ -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 ?>