Merge all of templates-sdk-dev into templates-sdk.
I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/
and then renamed it to templates-sdk/. So this is a clean copy.
Once this goes through cleanly, I'll delete templates-sdk-dev/ and update
all doc targets to use templates-sdk/.
Change-Id: I276695969e02fcf718370564e84b077a9d43725e
diff --git a/tools/droiddoc/templates-sdk/designpage.cs b/tools/droiddoc/templates-sdk/designpage.cs
index d9c2681..d75ce0a 100644
--- a/tools/droiddoc/templates-sdk/designpage.cs
+++ b/tools/droiddoc/templates-sdk/designpage.cs
@@ -7,12 +7,12 @@
Android Design<?cs if:page.title ?> - <?cs var:page.title ?><?cs /if ?>
</title>
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic">
+ <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic">
<link rel="stylesheet" href="<?cs var:toroot ?>assets/yui-3.3.0-reset-min.css">
- <link rel="stylesheet" href="<?cs var:toroot ?>assets/design/default.css?v=19">
+ <link rel="stylesheet" href="<?cs var:toroot ?>assets/design/default.css">
<script src="<?cs var:toroot ?>assets/jquery-1.6.2.min.js"></script>
<script>var SITE_ROOT = '<?cs var:toroot ?>design';</script>
- <script src="<?cs var:toroot ?>assets/design/default.js?v=19"></script>
+ <script src="<?cs var:toroot ?>assets/design/default.js"></script>
</head>
<body class="gc-documentation
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
@@ -42,10 +42,6 @@
<?cs elif:header.title ?><h2><?cs var:header.title ?></h2>
<?cs else ?><h2><?cs var:page.title ?></h2>
<?cs /if ?>
- <div class="paging-links" itemscope itemtype="http://schema.org/SiteNavigationElement">
- <a href="#" class="prev-page-link">Previous</a>
- <a href="#" class="next-page-link">Next</a>
- </div>
</div>
<?cs /if ?>
@@ -70,16 +66,16 @@
<p id="copyright">
Except as noted, this content is licensed under
- <a href="//creativecommons.org/licenses/by/2.5/">
+ <a href="http://creativecommons.org/licenses/by/2.5/">
Creative Commons Attribution 2.5</a>.<br>
For details and restrictions, see the
- <a href="//developer.android.com/license.html">Content License</a>.
+ <a href="http://developer.android.com/license.html">Content License</a>.
</p>
<p>
- <a href="//www.android.com/terms.html">Site Terms of Service</a> –
- <a href="//www.android.com/privacy.html">Privacy Policy</a> –
- <a href="//www.android.com/branding.html">Brand Guidelines</a>
+ <a href="http://www.android.com/terms.html">Site Terms of Service</a> –
+ <a href="http://www.android.com/privacy.html">Privacy Policy</a> –
+ <a href="http://www.android.com/branding.html">Brand Guidelines</a>
</p>
</div>