p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds. 

am: baa86c7bfe

Change-Id: I2e03858f2cf6af6bd418775befb683c124085678
This commit is contained in:
Dirk Dougherty 2016-08-22 23:18:41 +00:00 committed by android-build-merger
parent 93e05a935b baa86c7bfe
commit 15193e8200
5 changed files with 156 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/droiddoc/templates-sdk-dev/components/masthead.cs
View File

@ -88,12 +88,12 @@
<span class="dac-sprite dac-google-play"></span> <span class="dac-sprite dac-google-play"></span>
<span class="dac-visible-desktop-inline">Developer</span> <span class="dac-visible-desktop-inline">Developer</span>
Console Console
</a><?cs /if ?> </a><?cs /if ?><?cs
<?cs # ADD SEARCH AND MENU ?> # ADD SEARCH AND MENU ?><?cs
<?cs if:!ndk ?> if:!ndk ?><?cs
<?cs call:header_search_widget() ?> call:header_search_widget() ?><?cs
<?cs /if ?> /if ?>
</div><!-- end header-wrap.wrap --> </div><!-- end header-wrap.wrap -->
</div><!-- end header --> </div><!-- end header -->
</div> <!--end header-wrapper --> </div> <!--end header-wrapper -->
@ -275,12 +275,11 @@
<script>$('[data-dac-nav]').dacNav();</script> <script>$('[data-dac-nav]').dacNav();</script>
<?cs <?cs
/def ?><?cs # end custom_masthead() ?> /def ?><?cs # end custom_masthead() ?><?cs
def:toast() ?><?cs
<?cs def:toast() ?> # (UN)COMMENT TO TOGGLE VISIBILITY
<?cs # (UN)COMMENT TO TOGGLE VISIBILITY
<div class="dac-toast-group"> <div class="dac-toast-group">
<div class="dac-toast" data-toast> <div class="dac-toast" data-toast>
@ -290,6 +289,5 @@
</div> </div>
</div> </div>
?> ?><?cs
/def ?>
<?cs /def ?>

47
tools/droiddoc/templates-sdk-dev/customizations.cs
View File

@ -1,14 +1,14 @@
<?cs def:body_content_wrap_start() ?> <?cs def:body_content_wrap_start() ?>
<div class="wrap clearfix" id="body-content"> <div class="wrap clearfix" id="body-content">
<?cs /def ?> <?cs /def ?><?cs
<?cs def:fullpage() ?> def:fullpage() ?>
<div id="body-content"> <div id="body-content">
<div> <div>
<?cs /def ?> <?cs /def ?><?cs
<?cs # The default side navigation for the reference docs ?> # The default side navigation for the reference docs ?><?cs
<?cs def:reference_default_nav() ?> def:reference_default_nav() ?>
<!-- Fullscreen toggler --> <!-- Fullscreen toggler -->
<button data-fullscreen class="dac-nav-fullscreen"> <button data-fullscreen class="dac-nav-fullscreen">
<i class="dac-sprite dac-fullscreen"></i> <i class="dac-sprite dac-fullscreen"></i>
@ -73,9 +73,8 @@
</div> </div>
</div> </div>
<?cs /if ?> <?cs /if ?>
<?cs /def ?> <?cs /def ?><?cs
<?cs
def:ndk_nav() ?> def:ndk_nav() ?>
<div class="wrap clearfix" id="body-content"><div class="cols"> <div class="wrap clearfix" id="body-content"><div class="cols">
<div class="col-3 dac-toggle dac-mobile" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div class="col-3 dac-toggle dac-mobile" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
@ -91,9 +90,9 @@ elif:samples ?><?cs include:"../../../../frameworks/base/docs/html/ndk/samples/s
</div> </div>
</div> </div>
</div> <!-- end side-nav --> </div> <!-- end side-nav -->
<?cs /def ?> <?cs /def ?><?cs
<?cs def:header_search_widget() ?> def:header_search_widget() ?>
<form data-search class="dac-header-search"> <form data-search class="dac-header-search">
<button class="dac-header-search-close" data-search-close> <button class="dac-header-search-close" data-search-close>
<i class="dac-sprite dac-back-arrow"></i> <i class="dac-sprite dac-back-arrow"></i>
@ -107,9 +106,9 @@ elif:samples ?><?cs include:"../../../../frameworks/base/docs/html/ndk/samples/s
</button> </button>
</div> </div>
</form> </form>
<?cs /def ?> <?cs /def ?><?cs
<?cs def:search_results() ?> def:search_results() ?>
<div id="search-results" class="dac-search-results"> <div id="search-results" class="dac-search-results">
<div id="dac-search-results-history" class="dac-search-results-history"> <div id="dac-search-results-history" class="dac-search-results-history">
<div class="wrap dac-search-results-history-wrap"> <div class="wrap dac-search-results-history-wrap">
@ -148,9 +147,9 @@ elif:samples ?><?cs include:"../../../../frameworks/base/docs/html/ndk/samples/s
</div> </div>
</div> </div>
<?cs /def ?> <?cs /def ?><?cs
<?cs def:custom_left_nav() ?> def:custom_left_nav() ?>
<?cs if:(!fullpage && !nonavpage) || forcelocalnav ?> <?cs if:(!fullpage && !nonavpage) || forcelocalnav ?>
<a class="dac-nav-back-button dac-swap-section dac-up dac-no-anim" data-swap-button href="javascript:;"> <a class="dac-nav-back-button dac-swap-section dac-up dac-no-anim" data-swap-button href="javascript:;">
<i class="dac-sprite dac-nav-back"></i> <span class="dac-nav-back-title">Back</span> <i class="dac-sprite dac-nav-back"></i> <span class="dac-nav-back-title">Back</span>
@ -209,37 +208,37 @@ elif:samples ?><?cs include:"../../../../frameworks/base/docs/html/ndk/samples/s
<?cs /if ?> <?cs /if ?>
</div> </div>
<?cs /if ?> <?cs /if ?>
<?cs /def ?> <?cs /def ?><?cs
<?cs # appears at the bottom of every page ?> # appears at the bottom of every page ?><?cs
<?cs def:custom_cc_copyright() ?> 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/"> licensed under <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>. For details and Creative Commons Attribution 2.5</a>. For details and
restrictions, see the <a href="<?cs var:toroot ?>license.html">Content restrictions, see the <a href="<?cs var:toroot ?>license.html">Content
License</a>. License</a>.
<?cs /def ?> <?cs /def ?><?cs
<?cs def:custom_copyright() ?> def:custom_copyright() ?>
Except as noted, this content is licensed under <a 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"> For details and restrictions, see the <a href="<?cs var:toroot ?>license.html">
Content License</a>. Content License</a>.
<?cs /def ?> <?cs /def ?><?cs
<?cs def:custom_footerlinks() ?> def:custom_footerlinks() ?>
<a href="<?cs var:toroot ?>about/android.html">About Android</a> <a href="<?cs var:toroot ?>about/android.html">About Android</a>
<a href="<?cs var:toroot ?>auto/index.html">Auto</a> <a href="<?cs var:toroot ?>auto/index.html">Auto</a>
<a href="<?cs var:toroot ?>tv/index.html">TV</a> <a href="<?cs var:toroot ?>tv/index.html">TV</a>
<a href="<?cs var:toroot ?>wear/index.html">Wear</a> <a href="<?cs var:toroot ?>wear/index.html">Wear</a>
<a href="<?cs var:toroot ?>legal.html">Legal</a> <a href="<?cs var:toroot ?>legal.html">Legal</a>
<?cs /def ?> <?cs /def ?><?cs
<?cs # appears on the right side of the blue bar at the bottom off every page ?> # appears on the right side of the blue bar at the bottom off every page ?><?cs
<?cs def:custom_buildinfo() ?> def:custom_buildinfo() ?>
<?cs if:!google && !reference.gcm && !reference.gms ?> <?cs if:!google && !reference.gcm && !reference.gms ?>
Android <?cs var:sdk.version ?>&nbsp;r<?cs var:sdk.rel.id ?> &mdash; Android <?cs var:sdk.version ?>&nbsp;r<?cs var:sdk.rel.id ?> &mdash;
<?cs /if ?> <?cs /if ?>
<script src="<?cs var:toroot ?>timestamp.js" type="text/javascript"></script> <script src="<?cs var:toroot ?>timestamp.js" type="text/javascript"></script>
<script>document.write(BUILD_TIMESTAMP)</script> <script>document.write(BUILD_TIMESTAMP)</script>
<?cs /def ?> <?cs /def ?>

134
tools/droiddoc/templates-sdk-dev/docpage.cs
View File

@ -1,10 +1,10 @@
<?cs include:"doctype.cs" ?> <?cs if:!devsite ?><?cs
<?cs include:"macros.cs" ?> include:"doctype.cs" ?><?cs /if ?><?cs
<html<?cs if:devsite ?> devsite<?cs /if ?>> include:"macros.cs" ?><html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?> <?cs include:"head_tag.cs" ?>
<body class="gc-documentation <body<?cs
if:!devsite ?> class="gc-documentation<?cs
<?cs # add document classes for navigation header selection (and other stuff) ?> # add document classes for navigation header selection (and other stuff) ?>
<?cs <?cs
if:(google || reference.gms || reference.gcm) ?>google <?cs /if ?><?cs if:(google || reference.gms || reference.gcm) ?>google <?cs /if ?><?cs
if:ndk ?>ndk<?cs if:ndk ?>ndk<?cs
@ -39,14 +39,15 @@
elif:(preview) ?> preview<?cs elif:(preview) ?> preview<?cs
/if ?><?cs /if ?><?cs
if:page.trainingcourse ?> trainingcourse<?cs /if ?><?cs if:page.trainingcourse ?> trainingcourse<?cs /if ?><?cs
/if ?>" itemscope itemtype="http://schema.org/Article"><?cs /if ?>" itemscope itemtype="http://schema.org/Article"><?cs
include:"header.cs" ?> /if ?>><?cs
include:"header.cs" ?><?cs
<?cs if:(design||training||walkthru) && !page.trainingcourse && !page.article ?><?cs if:(design||training||walkthru) && !page.trainingcourse && !page.article ?><?cs
# header logic for docs that provide previous/next buttons ?> # header logic for docs that provide previous/next buttons ?><?cs
<?cs if:(header.hide||devsite) ?> if:(header.hide||devsite) ?><?cs
<?cs else ?> else ?>
<div class="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> <div class="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>">
<?cs if:header.justLinks ?>&nbsp; <?cs if:header.justLinks ?>&nbsp;
<?cs else ?> <?cs else ?>
<ul class="dac-header-crumbs"> <ul class="dac-header-crumbs">
@ -57,9 +58,9 @@ include:"header.cs" ?>
<script>$('.dac-nav-list').dacCurrentPage().dacCrumbs();</script> <script>$('.dac-nav-list').dacCurrentPage().dacCrumbs();</script>
<h1 itemprop="name"><?cs var:page.title ?> <h1 itemprop="name"><?cs var:page.title ?>
</h1> </h1><?cs
<?cs /if ?> /if ?><?cs
<?cs if:training ?> if:training ?>
<div class="training-nav-top" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div class="training-nav-top" itemscope itemtype="http://schema.org/SiteNavigationElement">
<a href="#" class="prev-page-link hide" <a href="#" class="prev-page-link hide"
zh-tw-lang="上一堂課" zh-tw-lang="上一堂課"
@ -85,8 +86,8 @@ include:"header.cs" ?>
ja-lang="開始する" ja-lang="開始する"
es-lang="Empezar" es-lang="Empezar"
>Get started</a> >Get started</a>
</div> </div><?cs
<?cs elif:!page.trainingcourse ?> elif:!page.trainingcourse ?>
<?cs # <div class="paging-linkss" itemscope itemtype="http://schema.org/SiteNavigationElement"> <?cs # <div class="paging-linkss" itemscope itemtype="http://schema.org/SiteNavigationElement">
<a href="#" class="prev-page-link hide" <a href="#" class="prev-page-link hide"
zh-tw-lang="上一堂課" zh-tw-lang="上一堂課"
@ -104,12 +105,12 @@ include:"header.cs" ?>
ja-lang="次へ" ja-lang="次へ"
es-lang="Siguiente" es-lang="Siguiente"
>Next</a> >Next</a>
</div> ?> </div> ?><?cs
<?cs /if ?><?cs # end if training ?> /if ?><?cs # end if training ?>
</div> </div>
<?cs /if ?><?cs # end if header.hide ?> <?cs /if ?><?cs # end if header.hide ?><?cs
<?cs elif:samplesProjectIndex ?> elif:samplesProjectIndex ?>
<div id="api-info-block"> <div id="api-info-block">
<div class="sum-details-links"> <div class="sum-details-links">
Overview Overview
@ -119,9 +120,9 @@ include:"header.cs" ?>
</div><!-- end breadcurmb block --> </div><!-- end breadcurmb block -->
<h1 itemprop="name"><?cs var:projectDir ?></h1> <h1 itemprop="name"><?cs var:projectDir ?></h1>
<?cs else ?> <?cs else ?><?cs
<?cs if:(!fullpage && !header.hide && !devsite) ?> if:(!fullpage && !header.hide && !devsite) ?><?cs
<?cs if:page.landing ?><?cs # header logic for docs that are landing pages ?> if:page.landing ?><?cs # header logic for docs that are landing pages ?>
<div class="landing-banner"> <div class="landing-banner">
<?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?> <?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?>
<div class="cols"> <div class="cols">
@ -139,8 +140,8 @@ include:"header.cs" ?>
</div> </div>
<?cs /if ?> <?cs /if ?>
</div> </div>
<?cs else ?> <?cs else ?><?cs
<?cs if:tab1 ?><div id="title-tabs-wrapper"><?cs /if ?> if:tab1 ?><div id="title-tabs-wrapper"><?cs /if ?>
<ul class="dac-header-crumbs"> <ul class="dac-header-crumbs">
<?cs # More <li> elements added here with javascript ?> <?cs # More <li> elements added here with javascript ?>
</ul> </ul>
@ -157,30 +158,32 @@ include:"header.cs" ?>
<li><a href="<?cs var:tab3.link ?>"><?cs var:tab3 ?></a></li><?cs /if ?> <li><a href="<?cs var:tab3.link ?>"><?cs var:tab3 ?></a></li><?cs /if ?>
</ul> </ul>
<?cs /if ?> <?cs /if ?>
<?cs if:tab1 ?></div><!-- end tab-wrapper --><?cs /if ?> <?cs if:tab1 ?></div><!-- end tab-wrapper --><?cs /if ?><?cs
<?cs /if ?> /if ?><?cs
<?cs /if ?> /if ?><?cs
<?cs /if ?><?cs # end if design ?> /if ?><?cs # end if design ?><?cs
<?cs if devsite ?> if devsite ?><?cs
<?cs if:tab1 ?> if:tab1 ?>
<div id="title-tabs-wrapper"> <div id="title-tabs-wrapper">
<ul id="title-tabs"> <ul id="title-tabs">
<li class="selected"><a href="<?cs var:tab1.link ?>"><?cs var:tab1 ?></a></li> <li class="selected"><a href="<?cs var:tab1.link ?>"><?cs var:tab1 ?></a></li>
<?cs if:tab2 ?> <?cs if:tab2 ?>
<li><a href="<?cs var:tab2.link ?>"><?cs var:tab2 ?></a></li><?cs /if ?> <li><a href="<?cs var:tab2.link ?>"><?cs var:tab2 ?></a></li><?cs /if ?>
<?cs if:tab3 ?> <?cs if:tab3 ?>
<li><a href="<?cs var:tab3.link ?>"><?cs var:tab3 ?></a></li><?cs /if ?> <li><a href="<?cs var:tab3.link ?>"><?cs var:tab3 ?></a></li><?cs /if ?>
</ul> </ul>
</div><!-- end tab-wrapper --> </div><!-- end tab-wrapper --><?cs
<?cs /if ?> /if ?><?cs
<?cs /if ?> /if ?><?cs
<?cs # THIS IS THE MAIN DOC CONTENT ?> # THIS IS THE MAIN DOC CONTENT ?><?cs
if:!devsite ?>
<div id="jd-content"> <div id="jd-content">
<div class="jd-descr" itemprop="articleBody"> <div class="jd-descr" itemprop="articleBody"><?cs
<?cs if:(!fullpage && !header.hide && devsite) ?> /if ?><?cs
<?cs if:page.landing ?><?cs # header logic for docs that are landing pages ?> if:(!fullpage && !header.hide && devsite) ?><?cs
if:page.landing ?><?cs # header logic for docs that are landing pages ?>
<div class="landing-banner"> <div class="landing-banner">
<?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?> <?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?>
<div class="cols"> <div class="cols">
@ -192,19 +195,22 @@ include:"header.cs" ?>
<h1 itemprop="name" style="margin-bottom:0;"><?cs var:page.title ?></h1> <h1 itemprop="name" style="margin-bottom:0;"><?cs var:page.title ?></h1>
<p itemprop="description"><?cs var:page.landing.intro ?></p> <p itemprop="description"><?cs var:page.landing.intro ?></p>
<p><a class="next-page-link topic-start-link"></a></p> <p><a class="next-page-link topic-start-link"></a></p><?cs
<?cs if:page.landing.image ?> if:page.landing.image ?>
</div> </div>
</div> </div><?cs
<?cs /if ?> /if ?>
</div> </div><?cs
<?cs /if ?> /if ?><?cs
<?cs /if ?> /if ?>
<?cs call:tag_list(root.descr) ?> <?cs call:tag_list(root.descr) ?><?cs
</div>
<?cs if:!fullscreen && (design||training||walkthru) && !page.landing && !page.trainingcourse if:!devsite ?>
</div><!-- end jd-descr --><?cs
/if ?><?cs
if:!fullscreen && (design||training||walkthru) && !page.landing && !page.trainingcourse
&& !footer.hide && !devsite?> && !footer.hide && !devsite?>
<div class="content-footer <?cs <div class="content-footer <?cs
if:fullpage ?>wrap<?cs /if ?>" if:fullpage ?>wrap<?cs /if ?>"
@ -240,14 +246,16 @@ include:"header.cs" ?>
<span class="page-link-caption">Next class</span> <span class="page-link-caption">Next class</span>
</a> </a>
</div> </div>
</div> </div><?cs
<?cs /if ?> /if ?><?cs
if:!devsite ?>
</div> <!-- end jd-content --><?cs
/if ?><?cs
</div> <!-- end jd-content --> if:!devsite ?>
<?cs if:!devsite ?>
<?cs include:"footer.cs" ?> <?cs include:"footer.cs" ?>
<?cs include:"trailer.cs" ?> <?cs include:"trailer.cs" ?>
<?cs /if ?> <?cs /if ?>
</body> </body>
</html> </html>

117
tools/droiddoc/templates-sdk-dev/head_tag.cs
View File

@ -1,9 +1,19 @@
<head> <head>
<?cs <title><?cs
####### If building devsite, add some meta data needed for when generating the top nav ######### ?> if:devsite ?><?cs
<?cs if:page.title ?><?cs
if:devsite ?> var:html_strip(page.title) ?><?cs
<meta name="top_category" value="<?cs else ?>Android Developers<?cs
/if ?><?cs
else ?><?cs
if:page.title ?><?cs
var:page.title ?> | <?cs
/if ?>Android Developers
<?cs /if ?><?cs
# END if/else devsite ?></title><?cs
####### If building devsite, add some meta data needed for when generating the top nav ######### ?><?cs
if:devsite ?>
<meta name="top_category" value="<?cs
if:ndk ?>ndk<?cs if:ndk ?>ndk<?cs
elif:(guide||develop||training||reference||tools||sdk||google||reference.gms||reference.gcm||samples) ?>develop<?cs elif:(guide||develop||training||reference||tools||sdk||google||reference.gms||reference.gcm||samples) ?>develop<?cs
elif:(topic||libraries||instantapps||perf||arc) ?>develop<?cs elif:(topic||libraries||instantapps||perf||arc) ?>develop<?cs
@ -14,9 +24,8 @@
elif:work ?>about<?cs elif:work ?>about<?cs
elif:preview ?>preview<?cs elif:preview ?>preview<?cs
else ?>none<?cs else ?>none<?cs
/if ?>" /> /if ?>" /><?cs set:dac_subcategory_set = #1 ?>
<?cs set:dac_subcategory_set = #1 ?> <meta name="subcategory" value="<?cs
<meta name="subcategory" value="<?cs
if:ndk ?><?cs if:ndk ?><?cs
if:guide ?>guide<?cs if:guide ?>guide<?cs
elif:samples ?>samples<?cs elif:samples ?>samples<?cs
@ -58,12 +67,11 @@
elif:design ?>design<?cs elif:design ?>design<?cs
elif:walkthru ?>walkthru<?cs elif:walkthru ?>walkthru<?cs
else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
/if ?>" /> /if ?>" /><?cs
if:nonavpage ?>
<?cs if:nonavpage ?> <meta name="hide_toc" value='True' /><?cs
<meta name="hide_toc" value='True' /> elif: !nonavpage && dac_subcategory_set && !tools && !sdk ?>
<?cs elif: !nonavpage && dac_subcategory_set && !tools && !sdk ?> <meta name="book_path" value="<?cs
<meta name="book_path" value="<?cs
if:ndk ?>/ndk<?cs if:ndk ?>/ndk<?cs
if:guide ?>/guides<?cs if:guide ?>/guides<?cs
elif:samples ?>/samples<?cs elif:samples ?>/samples<?cs
@ -98,10 +106,9 @@
elif:reference.testSupport ?>/reference/android/support/test<?cs elif:reference.testSupport ?>/reference/android/support/test<?cs
elif:reference.wearableSupport ?>/reference/android/support/wearable<?cs elif:reference.wearableSupport ?>/reference/android/support/wearable<?cs
elif:walkthru ?>/walkthru<?cs /if ?><?cs elif:walkthru ?>/walkthru<?cs /if ?><?cs
/if ?>/_book.yaml" /> /if ?>/_book.yaml" /><?cs
<?cs /if ?> /if ?>
<meta name="project_path" value="<?cs
<meta name="project_path" value="<?cs
if:(guide||develop||training||reference||tools||sdk||samples) ?><?cs if:(guide||develop||training||reference||tools||sdk||samples) ?><?cs
if:guide ?>/guide<?cs if:guide ?>/guide<?cs
elif:training ?>/training<?cs elif:training ?>/training<?cs
@ -123,35 +130,28 @@
elif:wearpreview ?>/wear<?cs elif:wearpreview ?>/wear<?cs
elif:work ?>/work<?cs elif:work ?>/work<?cs
elif:preview ?>/preview<?cs elif:preview ?>/preview<?cs
elif:design ?>/design<?cs /if ?>/_project.yaml" /> elif:design ?>/design<?cs /if ?>/_project.yaml" /><?cs
<?cs if:page.tags && page.tags != "" ?> if:page.tags && page.tags != "" ?>
<meta name="keywords" value='<?cs var:page.tags ?>' /> <meta name="keywords" value='<?cs var:page.tags ?>' /><?cs
<?cs /if ?> /if ?><?cs
if:meta.tags && meta.tags != "" ?>
<meta name="meta_tags" value='<?cs var:meta.tags ?>' /><?cs
/if ?><?cs
if:fullpage ?>
<meta name="full_width" value="True" /><?cs
/if ?><?cs
if:page.landing ?>
<meta name="page_type" value="landing" /><?cs
/if ?><?cs
if:page.article ?>
<meta name="page_type" value="article" /><?cs
/if ?><?cs
if:page.image ?>
<meta name="image_path" value='/<?cs var:page.image ?>' /><?cs
/if ?><?cs
/if ?><?cs # END if/else devsite ?><?cs
<?cs if:meta.tags && meta.tags != "" ?>
<meta name="meta_tags" value='<?cs var:meta.tags ?>' />
<?cs /if ?>
<?cs if:fullpage ?>
<meta name="full_width" value="True" />
<?cs /if ?>
<?cs if:page.landing ?>
<meta name="page_type" value="landing" />
<?cs /if ?>
<?cs if:page.article ?>
<meta name="page_type" value="article" />
<?cs /if ?>
<?cs if:page.image ?>
<meta name="image_path" value='/<?cs var:page.image ?>' />
<?cs /if ?>
<?cs /if ?><?cs
# END if/else devsite ?>
<?cs
if:!devsite ?> if:!devsite ?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" /> <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
@ -168,25 +168,11 @@
<link rel="alternate" href="http://developer.android.com/intl/zh-cn/<?cs var:path.canonical ?>" hreflang="zh-cn" /> <link rel="alternate" href="http://developer.android.com/intl/zh-cn/<?cs var:path.canonical ?>" hreflang="zh-cn" />
<link rel="alternate" href="http://developer.android.com/intl/zh-tw/<?cs var:path.canonical ?>" hreflang="zh-tw" /> <link rel="alternate" href="http://developer.android.com/intl/zh-tw/<?cs var:path.canonical ?>" hreflang="zh-tw" />
<?cs /if ?><?cs <?cs /if ?><?cs
# END if/else !devsite ?> # END if/else !devsite ?><?cs
<title><?cs if:page.metaDescription ?>
if:devsite ?><?cs <meta name="description" content="<?cs var:page.metaDescription ?>"><?cs
if:page.title ?><?cs /if ?><?cs
var:html_strip(page.title) ?><?cs
else ?>Android Developers<?cs
/if ?><?cs
else ?><?cs
if:page.title ?><?cs
var:page.title ?> | <?cs
/if ?>Android Developers
<?cs /if ?><?cs
# END if/else devsite ?></title>
<?cs
if:page.metaDescription ?>
<meta name="description" content="<?cs var:page.metaDescription ?>"><?cs
/if ?>
<?cs
if:!devsite ?> if:!devsite ?>
<!-- STYLESHEETS --> <!-- STYLESHEETS -->
<link rel="stylesheet" <link rel="stylesheet"
@ -228,7 +214,6 @@ if:android.whichdoc != 'online' ?>http:<?cs
ga('create', 'UA-49880327-2', 'android.com', {'name': 'universal'}); // New tracker); ga('create', 'UA-49880327-2', 'android.com', {'name': 'universal'}); // New tracker);
ga('send', 'pageview'); ga('send', 'pageview');
ga('universal.send', 'pageview'); // Send page view for new tracker. ga('universal.send', 'pageview'); // Send page view for new tracker.
</script> </script><?cs /if ?><?cs
<?cs /if ?><?cs
# END if/else !devsite ?> # END if/else !devsite ?>
</head> </head>

2
tools/droiddoc/templates-sdk-dev/header.cs
View File

@ -8,4 +8,4 @@
<?cs /if ?> <?cs /if ?>
<?cs call:search_results() ?> <?cs call:search_results() ?>
<?cs /if ?><?cs # end if/else !devsite ?> <?cs /if ?><?cs # end if/else !devsite ?>