Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the Resources tab)." into eclair
diff --git a/tools/droiddoc/src/DocFile.java b/tools/droiddoc/src/DocFile.java
index 51072df..cc7a8cf 100644
--- a/tools/droiddoc/src/DocFile.java
+++ b/tools/droiddoc/src/DocFile.java
@@ -139,7 +139,7 @@
ClearPage.write(hdf, "docpage.cs", outfile);
} else if (outfile.indexOf("resources/") != -1) {
hdf.setValue("resources", "true");
- ClearPage.write(hdf, "resourcespage.cs", outfile);
+ ClearPage.write(hdf, "docpage.cs", outfile);
} else {
ClearPage.write(hdf, "nosidenavpage.cs", outfile);
}
diff --git a/tools/droiddoc/templates-sdk/resourcespage.cs b/tools/droiddoc/templates-sdk/resourcespage.cs
deleted file mode 100644
index 12bcbad..0000000
--- a/tools/droiddoc/templates-sdk/resourcespage.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-<?cs include:"doctype.cs" ?>
-<?cs include:"macros.cs" ?>
-
-<html>
-<?cs include:"head_tag.cs" ?>
-
-<body class="gc-documentation">
-<?cs call:custom_masthead() ?>
-<?cs call:resources_tab_nav() ?>
-<a name="top"></a>
-<div class="g-unit" id="doc-content" >
- <div id="jd-header" class="guide-header">
- <span class="crumb">
- <?cs if:parent.link ?>
- <a href="<?cs var:parent.link ?>"><?cs var:parent.title ?></a> >
- <?cs else ?>
- <?cs /if ?>
- </span>
- <h1><?cs var:page.title ?></h1>
- </div>
-
- <div id="jd-content">
-
- <?cs call:tag_list(root.descr) ?>
-
-<?cs include:"footer.cs" ?>
-
-</div><!-- end doc-content -->
-
-<?cs include:"trailer.cs" ?>
-
-</body>
-</html>
-
-
-