summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-11-18 17:58:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-18 17:58:08 -0800
commitee1934be485e6f25fd9b89c8bf415d13326de1ab (patch)
treec2436950d55df1579007266e9a6875b93e55bd22 /tools
parentd54f8c2d1b4d88db84465fee93aa29103ca32078 (diff)
parentea994c2ad282cf744414a208f9ec2a8be67ca1aa (diff)
downloadbuild-ee1934be485e6f25fd9b89c8bf415d13326de1ab.zip
build-ee1934be485e6f25fd9b89c8bf415d13326de1ab.tar.gz
build-ee1934be485e6f25fd9b89c8bf415d13326de1ab.tar.bz2
am ea994c2a: am 45734df7: Merge "Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var." into klp-docs
* commit 'ea994c2ad282cf744414a208f9ec2a8be67ca1aa': Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var.
Diffstat (limited to 'tools')
-rw-r--r--tools/droiddoc/templates-sdk/head_tag.cs1
-rw-r--r--tools/droiddoc/templates-sdk/jd_lists_unified.cs1
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/droiddoc/templates-sdk/head_tag.cs b/tools/droiddoc/templates-sdk/head_tag.cs
index 379829c..54de169 100644
--- a/tools/droiddoc/templates-sdk/head_tag.cs
+++ b/tools/droiddoc/templates-sdk/head_tag.cs
@@ -50,6 +50,7 @@ else
/if ?>
<script type="text/javascript">
var toRoot = "<?cs var:toroot ?>";
+ var metaTags = [<?cs var:meta.tags ?>];
var devsite = <?cs if:devsite ?>true<?cs else ?>false<?cs /if ?>;
</script>
<script src="<?cs var:toroot ?>assets/js/docs.js" type="text/javascript"></script>
diff --git a/tools/droiddoc/templates-sdk/jd_lists_unified.cs b/tools/droiddoc/templates-sdk/jd_lists_unified.cs
new file mode 100644
index 0000000..417a5c1
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/jd_lists_unified.cs
@@ -0,0 +1 @@
+<?cs var:reference_tree ?>