Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad1ddbda00e0fcc713672f6e63acdf44, reversing
changes made to e09b2c16e32cee89d6b5ac29fe5a905b76872179.
diff --git a/tools/droiddoc/templates-sdk-dev/packages.cs b/tools/droiddoc/templates-sdk-dev/packages.cs
index 4db2ea9..5056d3a 100644
--- a/tools/droiddoc/templates-sdk-dev/packages.cs
+++ b/tools/droiddoc/templates-sdk-dev/packages.cs
@@ -1,19 +1,33 @@
-<?cs # THIS CREATES A LIST OF ALL PACKAGES AND NAMES IT packages.html ?>
-<?cs include:"macros.cs" ?>
<?cs include:"doctype.cs" ?>
+<?cs include:"macros.cs" ?>
<html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?>
-<?cs include:"body_tag.cs" ?>
+<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
+ <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
+ if:reference ?> reference<?cs
+ /if ?><?cs
+ elif:design ?>design<?cs
+ elif:distribute ?>distribute<?cs
+ /if ?>">
+ <a name="top"></a>
<?cs include:"header.cs" ?>
+<div class="col-12" id="doc-col">
+
+<div id="jd-header">
<h1><?cs var:page.title ?></h1>
-<p>These are the API packages.
-See all <a href="classes.html">API classes</a>.</p>
+</div>
+
+<div id="jd-content">
+
+<div class="jd-descr">
+<p><?cs call:tag_list(root.descr) ?></p>
+</div>
<?cs set:count = #1 ?>
-<table>
+<table class="jd-sumtable">
<?cs each:pkg = docs.packages ?>
- <tr class="api apilevel-<?cs var:pkg.since ?>" >
+ <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:pkg.since ?>" >
<td class="jd-linkcol"><?cs call:package_link(pkg) ?></td>
<td class="jd-descrcol" width="100%"><?cs call:tag_list(pkg.shortDescr) ?></td>
</tr>
@@ -21,9 +35,11 @@
<?cs /each ?>
</table>
-<?cs if:!devsite ?>
<?cs include:"footer.cs" ?>
+</div><!-- end jd-content -->
+</div> <!-- end doc-content -->
+
<?cs include:"trailer.cs" ?>
-<?cs /if ?>
+
</body>
</html>