Merge "Docs: Updates NDK download table for NDKr11" into mnc-mr-docs
diff --git a/tools/droiddoc/templates-sdk-refonly/assets/css/default.css b/tools/droiddoc/templates-sdk-refonly/assets/css/default.css
index 7989183..106ab2f 100644
--- a/tools/droiddoc/templates-sdk-refonly/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk-refonly/assets/css/default.css
@@ -2628,6 +2628,20 @@
margin-bottom:0;
}
+.summary-table {
+ background-color:#e1e4e6;
+ padding:1em;
+ margin-bottom:1.5em;
+}
+.summary-table p {
+ font-size:.98em;
+}
+
+.summary-table h5 {
+ line-height:1em;
+ font-size:.98em;
+}
+
body.about blockquote {
display:block;
float:right;
@@ -8501,12 +8515,12 @@
$spritesheet: width height image $spritesheet-sprites;
*/
.dac-sprite, #tb li:before, #qv li:before {
- background-image: url(/assets/images/sprite.png);
+ background-image: url(../../assets/images/sprite.png);
display: inline-block;
vertical-align: middle; }
@media screen and (min-device-pixel-ratio: 1.5) {
.dac-sprite, #tb li:before, #qv li:before {
- background-image: url(/assets/images/sprite-2x.png);
+ background-image: url(../../assets/images/sprite-2x.png);
background-size: 50% 50%; } }
.dac-sprite.dac-auto-chevron {
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index ccd6203..106ab2f 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -8515,12 +8515,12 @@
$spritesheet: width height image $spritesheet-sprites;
*/
.dac-sprite, #tb li:before, #qv li:before {
- background-image: url(/assets/images/sprite.png);
+ background-image: url(../../assets/images/sprite.png);
display: inline-block;
vertical-align: middle; }
@media screen and (min-device-pixel-ratio: 1.5) {
.dac-sprite, #tb li:before, #qv li:before {
- background-image: url(/assets/images/sprite-2x.png);
+ background-image: url(../../assets/images/sprite-2x.png);
background-size: 50% 50%; } }
.dac-sprite.dac-auto-chevron {
diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs
index 0019dfc..809409e 100644
--- a/tools/droiddoc/templates-sdk/docpage.cs
+++ b/tools/droiddoc/templates-sdk/docpage.cs
@@ -193,11 +193,11 @@
</div><!-- end doc-content -->
<?cs include:"trailer.cs" ?>
- <script src="https://developer.android.com/ytblogger_lists_unified.js?v=17" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_lists_unified.js?v=17" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_extras.js?v=17" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_collections.js?v=17" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=17" type="text/javascript"></script>
+ <script src="https://developer.android.com/ytblogger_lists_unified.js?v=18" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_lists_unified.js?v=18" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_extras.js?v=18" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_collections.js?v=18" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=18" type="text/javascript"></script>
</body>
</html>
diff --git a/tools/droiddoc/templates-sdk/head_tag.cs b/tools/droiddoc/templates-sdk/head_tag.cs
index 100b0bc..0e2dc8c 100644
--- a/tools/droiddoc/templates-sdk/head_tag.cs
+++ b/tools/droiddoc/templates-sdk/head_tag.cs
@@ -47,12 +47,12 @@
if:android.whichdoc != 'online' ?>http:<?cs
/if ?>//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"
title="roboto">
-<?cs
+<?cs
if:ndk ?><link rel="stylesheet" href="<?cs
if:android.whichdoc != 'online' ?>http:<?cs
/if ?>//fonts.googleapis.com/css?family=Roboto+Mono:400,500,700" title="roboto-mono" type="text/css"><?cs
/if ?>
-<link href="<?cs var:toroot ?>assets/css/default.css?v=17" rel="stylesheet" type="text/css">
+<link href="<?cs var:toroot ?>assets/css/default.css?v=18" rel="stylesheet" type="text/css">
<?cs if:reference && !(reference.gms || reference.gcm || preview) ?>
<!-- FULLSCREEN STYLESHEET -->
@@ -77,7 +77,7 @@
var devsite = <?cs if:devsite ?>true<?cs else ?>false<?cs /if ?>;
var useUpdatedTemplates = <?cs if:useUpdatedTemplates ?>true<?cs else ?>false<?cs /if ?>;
</script>
-<script src="<?cs var:toroot ?>assets/js/docs.js?v=17" type="text/javascript"></script>
+<script src="<?cs var:toroot ?>assets/js/docs.js?v=18" type="text/javascript"></script>
<?cs if:helpoutsWidget ?>
<script type="text/javascript" src="https://helpouts.google.com/ps/res/embed.js" defer async