Add Preview to templates-sdk develop nav and global nav in templates-sdk-dev. Remove dependence on -includePreview.
Change-Id: I1456c3c94522f58c7d1c899ff96dd95cdc6ada7c
diff --git a/tools/droiddoc/templates-sdk-dev/assets/js/docs.js b/tools/droiddoc/templates-sdk-dev/assets/js/docs.js
index c634a3b..6c19b4d 100644
--- a/tools/droiddoc/templates-sdk-dev/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk-dev/assets/js/docs.js
@@ -4447,6 +4447,8 @@
} else {
selected = parentNavEl.removeClass('has-subnav').addClass('selected');
}
+ } else if (body.hasClass('preview')) {
+ selected = navEl.find('> li.preview > a').addClass('selected');
}
return $(selected);
};
diff --git a/tools/droiddoc/templates-sdk-dev/components/masthead.cs b/tools/droiddoc/templates-sdk-dev/components/masthead.cs
index d857ffb..b105b52 100644
--- a/tools/droiddoc/templates-sdk-dev/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk-dev/components/masthead.cs
@@ -261,6 +261,9 @@
</li>
</ul>
</li>
+ <li class="dac-nav-item preview">
+ <a class="dac-nav-link" href="<?cs var:toroot ?>preview/index.html">Preview</a>
+ </li>
</ul>
</div>
</div>
diff --git a/tools/droiddoc/templates-sdk-dev/customizations.cs b/tools/droiddoc/templates-sdk-dev/customizations.cs
index d36e79f..15e8490 100644
--- a/tools/droiddoc/templates-sdk-dev/customizations.cs
+++ b/tools/droiddoc/templates-sdk-dev/customizations.cs
@@ -196,6 +196,8 @@
<?cs include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
<?cs elif:samples ?>
<?cs include:"../../../../frameworks/base/docs/html/samples/samples_toc.cs" ?>
+ <?cs elif:preview ?>
+ <?cs include:"../../../../frameworks/base/docs/html/preview/preview_toc.cs" ?>
<?cs elif:distribute ?>
<?cs if:googleplay ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/googleplay/googleplay_toc.cs" ?>
diff --git a/tools/droiddoc/templates-sdk-dev/docpage.cs b/tools/droiddoc/templates-sdk-dev/docpage.cs
index 7f53e6f..ab5fb40 100644
--- a/tools/droiddoc/templates-sdk-dev/docpage.cs
+++ b/tools/droiddoc/templates-sdk-dev/docpage.cs
@@ -36,6 +36,7 @@
if:wear ?> wear<?cs /if ?><?cs
if:tv ?> tv<?cs /if ?><?cs
if:auto ?> auto<?cs /if ?><?cs
+ elif:(preview) ?> preview<?cs
/if ?><?cs
if:page.trainingcourse ?> trainingcourse<?cs /if ?><?cs
/if ?>" itemscope itemtype="http://schema.org/Article"><?cs