Merge "Update droiddoc templates for build/make move" into nyc-dev-plus-aosp

This commit is contained in:
Dan Willemsen 2016-10-12 19:11:19 +00:00 committed by Android (Google) Code Review
commit 75e3c0aedf
4 changed files with 68 additions and 68 deletions

View File

@ -9,7 +9,7 @@ def:sdk_nav() ?>
<div id="devdoc-nav" class="scroll-pane">
<?cs
include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
</div>
@ -25,7 +25,7 @@ def:tools_nav() ?>
<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/tools/tools_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/tools/tools_toc.cs" ?>
</div>
@ -43,7 +43,7 @@ def:ndk_guides_nav() ?>
<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-ndk/ndk/guides/guides_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html-ndk/ndk/guides/guides_toc.cs" ?>
</div>
@ -62,7 +62,7 @@ def:ndk_reference_nav() ?>
<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-ndk/ndk/reference/reference_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html-ndk/ndk/reference/reference_toc.cs" ?>
</div>
@ -81,7 +81,7 @@ def:ndk_samples_nav() ?>
<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-ndk/ndk/samples/samples_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html-ndk/ndk/samples/samples_toc.cs" ?>
</div>
@ -100,7 +100,7 @@ def:ndk_downloads_nav() ?>
<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-ndk/ndk/downloads/downloads_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html-ndk/ndk/downloads/downloads_toc.cs" ?>
</div>
@ -120,7 +120,7 @@ def:training_nav() ?>
<?cs
include:"../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
</div>
@ -136,7 +136,7 @@ def:googleplay_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/distribute/googleplay/googleplay_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/googleplay/googleplay_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -150,7 +150,7 @@ def:essentials_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/distribute/essentials/essentials_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/essentials/essentials_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -164,7 +164,7 @@ def:users_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/distribute/users/users_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/users/users_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -178,7 +178,7 @@ def:engage_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/distribute/engage/engage_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/engage/engage_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -192,7 +192,7 @@ def:analyze_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/distribute/analyze/analyze_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/analyze/analyze_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -206,7 +206,7 @@ def:monetize_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/distribute/monetize/monetize_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/monetize/monetize_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -220,7 +220,7 @@ def:disttools_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/distribute/tools/disttools_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/tools/disttools_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -234,7 +234,7 @@ def:stories_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/distribute/stories/stories_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/stories/stories_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -250,7 +250,7 @@ def:guide_nav() ?>
<div id="devdoc-nav" class="scroll-pane">
<?cs
include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
</div>
@ -269,7 +269,7 @@ def:design_nav() ?>
<?cs
include:"../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
</div>
@ -287,7 +287,7 @@ def:distribute_nav() ?>
<div id="devdoc-nav" class="scroll-pane">
<?cs
include:"../../../../frameworks/base/docs/html/distribute/distribute_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/distribute/distribute_toc.cs" ?>
</div>
@ -306,7 +306,7 @@ def:samples_nav() ?>
<div id="devdoc-nav" class="scroll-pane">
<?cs
include:"../../../../frameworks/base/docs/html/samples/samples_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/samples/samples_toc.cs" ?>
</div>
@ -325,7 +325,7 @@ def:google_nav() ?>
<div id="devdoc-nav" class="scroll-pane">
<?cs
include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
</div>
@ -348,7 +348,7 @@ def:about_nav() ?>
<div id="devdoc-nav" class="scroll-pane">
<?cs
include:"../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
</div>
@ -368,7 +368,7 @@ def:wear_nav() ?>
<div id="devdoc-nav" class="scroll-pane">
<?cs
include:"../../../../frameworks/base/docs/html/wear/wear_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/wear/wear_toc.cs" ?>
</div>
@ -386,7 +386,7 @@ def:preview_nav() ?>
<div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
<div id="devdoc-nav" class="scroll-pane">
<?cs
include:"../../../../frameworks/base/docs/html/preview/preview_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/preview/preview_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>

View File

@ -3,7 +3,7 @@ def:sdk_nav() ?>
<div class="g-section g-tpl-240" id="body-content">
<div class="g-unit g-first" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
<div id="devdoc-nav"><?cs
include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<?cs /def ?>
@ -12,7 +12,7 @@ def:resources_tab_nav() ?>
<div class="g-section g-tpl-240" id="body-content">
<div class="g-unit g-first" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
<div id="devdoc-nav"><?cs
include:"../../../../frameworks/base/docs/html/resources/resources_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/resources/resources_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -26,7 +26,7 @@ def:guide_nav() ?>
<div class="g-section g-tpl-240" id="body-content">
<div class="g-unit g-first" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
<div id="devdoc-nav"><?cs
include:"../../../../vendor/pdk/data/google/docs/guide/guide_toc.cs" ?>
include:"../../../../../vendor/pdk/data/google/docs/guide/guide_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
<script>
@ -37,7 +37,7 @@ def:guide_nav() ?>
<?cs /def ?>
<?cs
def:design_nav() ?>
<?cs include:"../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
<?cs /def ?>
<?cs # The default side navigation for the reference docs ?><?cs

View File

@ -10,7 +10,7 @@ def:sdk_nav() ?>
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
</div>
@ -25,7 +25,7 @@ def:resources_tab_nav() ?>
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../frameworks/base/docs/html/resources/resources_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/resources/resources_toc.cs" ?>
</div>
@ -43,7 +43,7 @@ def:tools_nav() ?>
<div id="devdoc-nav" class="scroll-pane">
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../frameworks/base/docs/html/tools/tools_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/tools/tools_toc.cs" ?>
</div>
@ -63,7 +63,7 @@ def:training_nav() ?>
<?cs
include:"../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
</div>
@ -83,7 +83,7 @@ def:guide_nav() ?>
<?cs
include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
</div>
@ -103,7 +103,7 @@ def:design_nav() ?>
<?cs
include:"../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
</div>
@ -122,7 +122,7 @@ def:distribute_nav() ?>
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../frameworks/base/docs/html/distribute/distribute_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/distribute/distribute_toc.cs" ?>
</div>
@ -142,7 +142,7 @@ def:google_nav() ?>
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
</div>
@ -166,7 +166,7 @@ def:about_nav() ?>
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
</div>
@ -186,7 +186,7 @@ def:dist_more_nav() ?>
<?cs
include:"../../../../frameworks/base/docs/html/distribute/more/more_toc.cs" ?>
include:"../../../../../frameworks/base/docs/html/distribute/more/more_toc.cs" ?>
</div>
@ -397,7 +397,7 @@ def:devices_nav() ?>
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../docs/source.android.com/src/devices/devices_toc.cs" ?>
include:"../../../../../docs/source.android.com/src/devices/devices_toc.cs" ?>
</div>
<script type="text/javascript">
@ -419,7 +419,7 @@ def:compatibility_nav() ?>
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../docs/source.android.com/src/compatibility/compatibility_toc.cs" ?>
include:"../../../../../docs/source.android.com/src/compatibility/compatibility_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
@ -438,7 +438,7 @@ def:source_nav() ?>
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../docs/source.android.com/src/source/source_toc.cs" ?>
include:"../../../../../docs/source.android.com/src/source/source_toc.cs" ?>
</div>
</div> <!-- end side-nav -->
@ -457,7 +457,7 @@ def:security_nav() ?>
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs
include:"../../../../docs/source.android.com/src/security/security_toc.cs" ?>
include:"../../../../../docs/source.android.com/src/security/security_toc.cs" ?>
</div>
</div> <!-- end side-nav -->

View File

@ -18,7 +18,7 @@ def:reference_default_nav() ?>
<!-- End: Fullscreen toggler -->
<?cs if:reference.gcm || reference.gms ?>
<?cs include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
<script type="text/javascript">
showGoogleRefTree();
</script>
@ -82,10 +82,10 @@ def:ndk_nav() ?>
<div class="dac-toggle-content" id="devdoc-nav">
<div class="scroll-pane">
<?cs
if:guide ?><?cs include:"../../../../frameworks/base/docs/html/ndk/guides/guides_toc.cs" ?><?cs
elif:reference ?><?cs include:"../../../../frameworks/base/docs/html/ndk/reference/reference_toc.cs" ?><?cs
elif:downloads ?><?cs include:"../../../../frameworks/base/docs/html/ndk/downloads/downloads_toc.cs" ?><?cs
elif:samples ?><?cs include:"../../../../frameworks/base/docs/html/ndk/samples/samples_toc.cs" ?><?cs
if:guide ?><?cs include:"../../../../../frameworks/base/docs/html/ndk/guides/guides_toc.cs" ?><?cs
elif:reference ?><?cs include:"../../../../../frameworks/base/docs/html/ndk/reference/reference_toc.cs" ?><?cs
elif:downloads ?><?cs include:"../../../../../frameworks/base/docs/html/ndk/downloads/downloads_toc.cs" ?><?cs
elif:samples ?><?cs include:"../../../../../frameworks/base/docs/html/ndk/samples/samples_toc.cs" ?><?cs
/if ?>
</div>
</div>
@ -161,52 +161,52 @@ def:custom_left_nav() ?>
if:referenceonly ?>style="top:0 !important;"<?cs /if ?>>
<?cs if:ndk ?>
<?cs if:guide ?>
<?cs include:"../../../../frameworks/base/docs/html/ndk/guides/guides_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/ndk/guides/guides_toc.cs" ?>
<?cs elif:reference ?>
<?cs include:"../../../../frameworks/base/docs/html/ndk/reference/reference_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/ndk/reference/reference_toc.cs" ?>
<?cs elif:downloads ?>
<?cs include:"../../../../frameworks/base/docs/html/ndk/downloads/downloads_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/ndk/downloads/downloads_toc.cs" ?>
<?cs elif:samples ?>
<?cs include:"../../../../frameworks/base/docs/html/ndk/samples/samples_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/ndk/samples/samples_toc.cs" ?>
<?cs else ?>
<?cs call:reference_default_nav() ?>
<?cs /if ?>
<?cs elif:guide ?>
<?cs include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
<?cs elif:design ?>
<?cs include:"../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/design/design_toc.cs" ?>
<?cs elif:training ?>
<?cs include:"../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/training/training_toc.cs" ?>
<?cs elif:tools ?>
<?cs include:"../../../../frameworks/base/docs/html/tools/tools_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/tools/tools_toc.cs" ?>
<?cs elif:google ?>
<?cs include:"../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/google/google_toc.cs" ?>
<?cs elif:samples ?>
<?cs include:"../../../../frameworks/base/docs/html/samples/samples_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/samples/samples_toc.cs" ?>
<?cs elif:preview ?>
<?cs include:"../../../../frameworks/base/docs/html/preview/preview_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/preview/preview_toc.cs" ?>
<?cs elif:preview ?>
<?cs include:"../../../../frameworks/base/docs/html/wear/preview/preview_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/wear/preview/preview_toc.cs" ?>
<?cs elif:distribute ?>
<?cs if:googleplay ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/googleplay/googleplay_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/googleplay/googleplay_toc.cs" ?>
<?cs elif:essentials ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/essentials/essentials_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/essentials/essentials_toc.cs" ?>
<?cs elif:users ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/users/users_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/users/users_toc.cs" ?>
<?cs elif:engage ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/engage/engage_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/engage/engage_toc.cs" ?>
<?cs elif:monetize ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/monetize/monetize_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/monetize/monetize_toc.cs" ?>
<?cs elif:analyze ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/analyze/analyze_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/analyze/analyze_toc.cs" ?>
<?cs elif:disttools ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/tools/disttools_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/tools/disttools_toc.cs" ?>
<?cs elif:stories ?>
<?cs include:"../../../../frameworks/base/docs/html/distribute/stories/stories_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/distribute/stories/stories_toc.cs" ?>
<?cs /if ?>
<?cs elif:about ?>
<?cs include:"../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
<?cs include:"../../../../../frameworks/base/docs/html/about/about_toc.cs" ?>
<?cs else ?>
<?cs call:reference_default_nav() ?>
<?cs /if ?>
@ -245,4 +245,4 @@ def:custom_buildinfo() ?>
<?cs /if ?>
<script src="<?cs var:toroot ?>timestamp.js" type="text/javascript"></script>
<script>document.write(BUILD_TIMESTAMP)</script>
<?cs /def ?>
<?cs /def ?>