# Via Android Git Automerger (1) and Scott Main (1) * commit '894423441edeb5ff431c1c82db8fa42ab25a27f7': docs: update template files with those from the templates-ds directory
This commit is contained in:
Scott Main
Android Git Automerger
commit
20ba728ecb
16 changed files with 2815 additions and 37 deletions
|
|
@ -3785,7 +3785,8 @@ EndColorStr='#ececec');
|
|||
-transition-timing-function:ease;
|
||||
}
|
||||
|
||||
.morehover:hover {
|
||||
.morehover:hover,
|
||||
.morehover.hover {
|
||||
opacity:1;
|
||||
height:385px;
|
||||
width:268px;
|
||||
|
|
|
|||
2766
tools/droiddoc/templates-sdk/assets/js/android_3p-bundle.js
Normal file
2766
tools/droiddoc/templates-sdk/assets/js/android_3p-bundle.js
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
<?cs include:"doctype.cs" ?>
|
||||
<?cs include:"macros.cs" ?>
|
||||
<html>
|
||||
<html<?cs if:devsite ?> devsite<?cs /if ?>>
|
||||
<?cs include:"head_tag.cs" ?>
|
||||
<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
|
||||
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?cs include:"doctype.cs" ?>
|
||||
<?cs include:"macros.cs" ?>
|
||||
<html>
|
||||
<html<?cs if:devsite ?> devsite<?cs /if ?>>
|
||||
<?cs include:"head_tag.cs" ?>
|
||||
<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
|
||||
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
|
||||
|
|
|
|||
|
|
@ -62,27 +62,33 @@
|
|||
<li class="active"><a>Android Developers</a></li>
|
||||
<li><a href="http://source.android.com">Android Open Source Project</a></li>
|
||||
</ul>
|
||||
<!-- <div class="header">Support</div>
|
||||
<ul>
|
||||
<li><a href="<?cs var:toroot ?>support.html">Developer Support</a></li>
|
||||
</ul> -->
|
||||
<div class="header">Languages</div>
|
||||
<div id="language" class="locales">
|
||||
<select name="language" onChange="changeLangPref(this.value, true)">
|
||||
<option value="en">English</option>
|
||||
<option value="es">Español</option>
|
||||
<option value="ja">日本語</option>
|
||||
<option value="ko">한국어</option>
|
||||
<option value="ru">Русский</option>
|
||||
<option value="zh-CN">中文 (中国)</option>
|
||||
<option value="zh-TW">中文 (台灣)</option>
|
||||
</select>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
loadLangPref();
|
||||
//-->
|
||||
</script>
|
||||
|
||||
<?cs ############ TODO: Remove when we're happy with Devsite ############# ?>
|
||||
<?cs # Use differenc lang switcher for devsite and gae server ?>
|
||||
<?cs if:devsite ?>
|
||||
<div class="header">Language</div>
|
||||
<?cs elif:android.whichdoc == "online" ?>
|
||||
<div class="header">Language</div>
|
||||
<div id="language" class="locales">
|
||||
<select name="language" onChange="changeLangPref(this.value, true)">
|
||||
<option value="en">English</option>
|
||||
<option value="es">Español</option>
|
||||
<option value="ja">日本語</option>
|
||||
<option value="ko">한국어</option>
|
||||
<option value="ru">Русский</option>
|
||||
<option value="zh-CN">中文 (中国)</option>
|
||||
<option value="zh-TW">中文 (台灣)</option>
|
||||
</select>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
loadLangPref();
|
||||
//-->
|
||||
</script>
|
||||
<?cs /if ?>
|
||||
<?cs # End of devsite vs. gae version of lang switcher ?>
|
||||
|
||||
|
||||
<br class="clearfix" />
|
||||
</div>
|
||||
<div class="bottom"></div>
|
||||
|
|
|
|||
|
|
@ -363,6 +363,8 @@ def:custom_footerlinks() ?>
|
|||
def:custom_buildinfo() ?><?cs
|
||||
if:!google ?>
|
||||
Android <?cs var:sdk.version ?> r<?cs var:sdk.rel.id ?> — <?cs
|
||||
/if ?><?cs var:page.now ?>
|
||||
/if ?>
|
||||
<script src="<?cs var:toroot ?>timestamp.js" type="text/javascript"></script>
|
||||
<script>document.write(BUILD_TIMESTAMP)</script>
|
||||
<?cs /def ?>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?cs include:"doctype.cs" ?>
|
||||
<?cs include:"macros.cs" ?>
|
||||
<html>
|
||||
<html<?cs if:devsite ?> devsite<?cs /if ?>>
|
||||
<?cs include:"head_tag.cs" ?>
|
||||
<body class="gc-documentation <?cs if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?>
|
||||
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs if:guide ?> guide<?cs /if ?><?cs
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div id="footer" class="wrap" <?cs if:fullpage ?>style="width:940px"<?cs /if ?>>
|
||||
|
||||
<?cs if:reference||guide ?>
|
||||
<?cs if:reference ?>
|
||||
<div id="copyright">
|
||||
<?cs call:custom_copyright() ?>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,12 @@ type="text/css">
|
|||
|
||||
<!-- JAVASCRIPT -->
|
||||
<script src="<?cs if:android.whichdoc != 'online' ?>http:<?cs /if ?>//www.google.com/jsapi" type="text/javascript"></script>
|
||||
<script src="<?cs var:toroot ?>assets/js/global-libraries-combined.js" type="text/javascript"></script>
|
||||
<?cs
|
||||
if:devsite
|
||||
?><script src="//android-dot-devsite.googleplex.com/_static/js/android_3p-bundle.js" type="text/javascript"></script><?cs
|
||||
else
|
||||
?><script src="<?cs var:toroot ?>assets/js/android_3p-bundle.js" type="text/javascript"></script><?cs
|
||||
/if ?>
|
||||
<script type="text/javascript">
|
||||
var toRoot = "<?cs var:toroot ?>";
|
||||
<?cs if:devsite ?>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?cs include:"doctype.cs" ?>
|
||||
<?cs include:"macros.cs" ?>
|
||||
<html>
|
||||
<html<?cs if:devsite ?> devsite<?cs /if ?>>
|
||||
<?cs include:"head_tag.cs" ?>
|
||||
<body class="gc-documentation
|
||||
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?cs include:"doctype.cs" ?>
|
||||
<?cs include:"macros.cs" ?>
|
||||
<html>
|
||||
<html<?cs if:devsite ?> devsite<?cs /if ?>>
|
||||
<?cs include:"head_tag.cs" ?>
|
||||
|
||||
<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?cs include:"doctype.cs" ?>
|
||||
<?cs include:"macros.cs" ?>
|
||||
<html>
|
||||
<html<?cs if:devsite ?> devsite<?cs /if ?>>
|
||||
<?cs include:"head_tag.cs" ?>
|
||||
<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
|
||||
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?cs include:"doctype.cs" ?>
|
||||
<?cs include:"macros.cs" ?>
|
||||
<?cs set:resources="true" ?>
|
||||
<html>
|
||||
<html<?cs if:devsite ?> devsite<?cs /if ?>>
|
||||
<?cs include:"head_tag.cs" ?>
|
||||
<?cs include:"header.cs" ?>
|
||||
<body class="gc-documentation">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?cs include:"doctype.cs" ?>
|
||||
<?cs include:"macros.cs" ?>
|
||||
<html>
|
||||
<html<?cs if:devsite ?> devsite<?cs /if ?>>
|
||||
<?cs if:sdk.redirect ?>
|
||||
<head>
|
||||
<title>Redirecting...</title>
|
||||
|
|
|
|||
1
tools/droiddoc/templates-sdk/timestamp.cs
Normal file
1
tools/droiddoc/templates-sdk/timestamp.cs
Normal file
|
|
@ -0,0 +1 @@
|
|||
var BUILD_TIMESTAMP = "<?cs var:page.now ?>";
|
||||
|
|
@ -18,7 +18,7 @@ window.gOverride = {
|
|||
pEnabled:false
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
<link href="<?cs var:toroot ?>assets/js/grid/960.gridder.css" rel="stylesheet" type="text/css">
|
||||
<script src="<?cs var:toroot ?>assets/js/grid/960.gridder.js" type="text/javascript"></script>
|
||||
-->
|
||||
|
|
@ -42,7 +42,4 @@ $(".feed").dacTabbedList({
|
|||
});
|
||||
</script>
|
||||
<?cs /if ?>
|
||||
<script type="text/javascript">
|
||||
init(); /* initialize android-developer-docs.js */
|
||||
</script>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue