Deleting or modifying files in new templates-ndk directory.
Change-Id: I0244cd55e2ae25c08672fdf546a386592156e681
diff --git a/tools/droiddoc/templates-ndk/customizations.cs b/tools/droiddoc/templates-ndk/customizations.cs
index c8c88cc..ea16501 100644
--- a/tools/droiddoc/templates-ndk/customizations.cs
+++ b/tools/droiddoc/templates-ndk/customizations.cs
@@ -1,14 +1,14 @@
-<?cs
+<?cs
def:fullpage() ?>
<div id="body-content">
<?cs /def ?>
-<?cs
+<?cs
def:sdk_nav() ?>
<div class="wrap clearfix" id="body-content">
<div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
<div id="devdoc-nav" class="scroll-pane">
-<?cs
+<?cs
include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
@@ -24,10 +24,10 @@
<div class="wrap clearfix" id="body-content">
<div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
<div id="devdoc-nav" class="scroll-pane">
-<?cs
+<?cs
include:"../../../../frameworks/base/docs/html/tools/tools_toc.cs" ?>
-
-
+
+
</div>
</div> <!-- end side-nav -->
<script>
@@ -37,15 +37,53 @@
</script>
<?cs /def ?>
<?cs
+
+def:ndk2_guides_nav() ?>
+ <div class="wrap clearfix" id="body-content">
+ <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+ <div id="devdoc-nav" class="scroll-pane">
+<?cs
+ include:"../../../../frameworks/base/docs/html/ndk2/guides/guides_toc.cs" ?>
+
+
+ </div>
+ </div> <!-- end side-nav -->
+ <script>
+ $(document).ready(function() {
+ scrollIntoView("devdoc-nav");
+ });
+ </script>
+<?cs /def ?>
+
+<?cs
+
+def:ndk2_ref_nav() ?>
+ <div class="wrap clearfix" id="body-content">
+ <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
+ <div id="devdoc-nav" class="scroll-pane">
+<?cs
+ include:"../../../../frameworks/base/docs/html/ndk2/refer/refer_toc.cs" ?>
+
+
+ </div>
+ </div> <!-- end side-nav -->
+ <script>
+ $(document).ready(function() {
+ scrollIntoView("devdoc-nav");
+ });
+ </script>
+<?cs /def ?>
+
+<?cs
def:training_nav() ?>
<div class="wrap clearfix" id="body-content">
<div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
<div id="devdoc-nav" class="scroll-pane">
-<?cs
+<?cs
include:"../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
-
+
</div>
</div> <!-- end side-nav -->
@@ -173,9 +211,9 @@
<div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
<div id="devdoc-nav" class="scroll-pane">
-<?cs
+<?cs
include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
-
+
</div>
</div> <!-- end side-nav -->
@@ -194,7 +232,7 @@
<?cs
include:"../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
-
+
</div>
</div> <!-- end side-nav -->
@@ -212,7 +250,7 @@
<?cs
include:"../../../../frameworks/base/docs/html/distribute/distribute_toc.cs" ?>
-
+
</div>
</div> <!-- end side-nav -->
@@ -250,12 +288,12 @@
<?cs
include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
-
+
</div>
<script type="text/javascript">
showGoogleRefTree();
-
+
</script>
</div> <!-- end side-nav -->
<script>
@@ -273,7 +311,7 @@
<?cs
include:"../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
-
+
</div>
</div> <!-- end side-nav -->
@@ -320,7 +358,7 @@
</script>
<?cs /def ?>
-<?cs # The default side navigation for the reference docs ?><?cs
+<?cs # The default side navigation for the reference docs ?><?cs
def:default_left_nav() ?>
<?cs if:reference.gcm || reference.gms ?>
<?cs call:google_nav() ?>
@@ -341,15 +379,15 @@
<div id="api-nav-title">Android APIs</div>
</div><!-- end nav header -->
<script>
- var SINCE_DATA = [ <?cs
- each:since = since ?>'<?cs
- var:since.name ?>'<?cs
+ var SINCE_DATA = [ <?cs
+ each:since = since ?>'<?cs
+ var:since.name ?>'<?cs
if:!last(since) ?>, <?cs /if ?><?cs
- /each
+ /each
?> ];
buildApiLevelSelector();
</script>
-
+
<div id="swapper">
<div id="nav-panels">
<div id="resize-packages-nav">
@@ -364,7 +402,7 @@
<div id="classes-nav" class="scroll-pane">
-<?cs
+<?cs
if:subcount(class.package) ?>
<ul>
<?cs call:list("Annotations", class.package.annotations) ?>
@@ -373,7 +411,7 @@
<?cs call:list("Enums", class.package.enums) ?>
<?cs call:list("Exceptions", class.package.exceptions) ?>
<?cs call:list("Errors", class.package.errors) ?>
- </ul><?cs
+ </ul><?cs
elif:subcount(package) ?>
<ul>
<?cs call:class_link_list("Annotations", package.annotations) ?>
@@ -382,11 +420,11 @@
<?cs call:class_link_list("Enums", package.enums) ?>
<?cs call:class_link_list("Exceptions", package.exceptions) ?>
<?cs call:class_link_list("Errors", package.errors) ?>
- </ul><?cs
+ </ul><?cs
else ?>
- <p style="padding:10px">Select a package to view its members</p><?cs
+ <p style="padding:10px">Select a package to view its members</p><?cs
/if ?><br/>
-
+
</div><!-- end classes -->
</div><!-- end nav-panels -->
@@ -427,7 +465,7 @@
});
</script>
<?cs /if ?>
- <?cs
+ <?cs
/def ?>
@@ -529,25 +567,29 @@
-<?cs
+<?cs
def:custom_left_nav() ?><?cs
if:fullpage ?><?cs
call:fullpage() ?><?cs
elif:nonavpage ?><?cs
call:no_nav() ?><?cs
- elif:guide ?><?cs
- call:guide_nav() ?><?cs
+ elif:guide ?><?cs
+ call:guide_nav() ?><?cs
elif:design ?><?cs
- call:design_nav() ?><?cs
- elif:training ?><?cs
- call:training_nav() ?><?cs
- elif:tools ?><?cs
+ call:design_nav() ?><?cs
+ elif:training ?><?cs
+ call:training_nav() ?><?cs
+ elif:tools ?><?cs
call:tools_nav() ?><?cs
- elif:google ?><?cs
- call:google_nav() ?><?cs
+ elif:ndk2 ?><?cs
+ call:ndk2_guides_nav() ?><?cs
+ elif:refer ?><?cs
+ call:ndk2_ref_nav() ?><?cs
+ elif:google ?><?cs
+ call:google_nav() ?><?cs
elif:samples ?><?cs
call:samples_nav() ?><?cs
- elif:distribute ?><?cs
+ elif:distribute ?><?cs
if:googleplay ?><?cs
call:googleplay_nav() ?><?cs
elif:essentials ?><?cs
@@ -578,33 +620,33 @@
/if ?><?cs
/def ?>
-<?cs # appears at the bottom of every page ?><?cs
+<?cs # appears at the bottom of every page ?><?cs
def:custom_cc_copyright() ?>
- Except as noted, this content is
+ Except as noted, this content is
licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
- Creative Commons Attribution 2.5</a>. For details and
- restrictions, see the <a href="<?cs var:toroot ?>license.html">Content
- License</a>.<?cs
+ Creative Commons Attribution 2.5</a>. For details and
+ restrictions, see the <a href="<?cs var:toroot ?>license.html">Content
+ License</a>.<?cs
/def ?>
-<?cs
+<?cs
def:custom_copyright() ?>
Except as noted, this content is licensed under <a
- href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
+ href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
For details and restrictions, see the <a href="<?cs var:toroot ?>license.html">
- Content License</a>.<?cs
+ Content License</a>.<?cs
/def ?>
-<?cs
+<?cs
def:custom_footerlinks() ?>
<p>
<a href="<?cs var:toroot ?>about/index.html">About Android</a> |
<a href="<?cs var:toroot ?>legal.html">Legal</a> |
<a href="<?cs var:toroot ?>support.html">Support</a>
- </p><?cs
+ </p><?cs
/def ?>
-<?cs # appears on the right side of the blue bar at the bottom off every page ?><?cs
+<?cs # appears on the right side of the blue bar at the bottom off every page ?><?cs
def:custom_buildinfo() ?><?cs
if:!google && !reference.gcm && !reference.gms ?>
Android <?cs var:sdk.version ?> r<?cs var:sdk.rel.id ?> — <?cs