am d1283889: am 48141e05: am 5a97f244: am 529a107f: Add new subtab under Distribute tab.

* commit 'd12838890563b2fb4532630373760a995970f687':
  Add new subtab under Distribute tab.
This commit is contained in:
Dirk Dougherty 2015-01-16 18:17:59 +00:00 committed by Android Git Automerger
commit 4433ac859c
6 changed files with 29 additions and 7 deletions

View File

@ -4066,7 +4066,7 @@ EndColorStr='#ececec');
height: 38px;
}
#header-wrapper #nav-x ul.nav-x li {
margin-right: 36px !important;
margin-right: 31px !important;
margin-top: 5px;
margin-bottom: 0px;
height: 30px;
@ -4424,7 +4424,7 @@ body.reference a[name] {
}
#header-wrap.quicknav {
height:196px;
height:216px;
}

View File

@ -234,6 +234,8 @@ $(document).ready(function() {
$("#nav-x li.engage a").addClass("selected");
} else if (secondFrag == "monetize") {
$("#nav-x li.monetize a").addClass("selected");
} else if (secondFrag == "analyze") {
$("#nav-x li.analyze a").addClass("selected");
} else if (secondFrag == "tools") {
$("#nav-x li.disttools a").addClass("selected");
} else if (secondFrag == "stories") {

View File

@ -171,6 +171,7 @@
<li><a href="<?cs var:toroot ?>distribute/users/index.html">Get Users</a></li>
<li><a href="<?cs var:toroot ?>distribute/engage/index.html">Engage &amp; Retain</a></li>
<li><a href="<?cs var:toroot ?>distribute/monetize/index.html">Monetize</a></li>
<li><a href="<?cs var:toroot ?>distribute/analyze/index.html">Analyze</a></li>
<li><a href="<?cs var:toroot ?>distribute/tools/index.html">Tools &amp; Reference</a></li>
<li><a href="<?cs var:toroot ?>distribute/stories/index.html">Developer Stories</a></li>
</ul>
@ -268,7 +269,7 @@
</div>
<!-- /Sendondary x-nav DEVELOP -->
<?cs elif:distribute || googleplay || essentials || users || engage || monetize || disttools || stories ?>
<?cs elif:distribute || googleplay || essentials || users || engage || monetize || analyze || disttools || stories ?>
<!-- Secondary distribute x-nav -->
<div id="nav-x">
<div class="wrap">
@ -284,6 +285,9 @@
<li class="monetize"><a href="<?cs var:toroot ?>distribute/monetize/index.html"
>Monetize</a>
</li>
<li class="analyze"><a href="<?cs var:toroot ?>distribute/analyze/index.html"
>Analyze</a>
</li>
<li class="disttools"><a href="<?cs var:toroot ?>distribute/tools/index.html"
>Tools</a>
</li>

View File

@ -112,6 +112,20 @@ def:engage_nav() ?>
</script>
<?cs /def ?><?cs
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" ?>
</div>
</div> <!-- end side-nav -->
<script>
$(document).ready(function() {
scrollIntoView("devdoc-nav");
});
</script>
<?cs /def ?><?cs
def:monetize_nav() ?>
<div class="wrap clearfix" id="body-content">
<div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
@ -544,6 +558,8 @@ def:custom_left_nav() ?><?cs
call:engage_nav() ?><?cs
elif:monetize ?><?cs
call:monetize_nav() ?><?cs
elif:analyze ?><?cs
call:analyze_nav() ?><?cs
elif:disttools ?><?cs
call:disttools_nav() ?><?cs
elif:stories ?><?cs

View File

@ -194,9 +194,9 @@ include:"header.cs" ?>
<?cs include:"trailer.cs" ?>
<script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_lists_unified.js?v=7" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_extras.js?v=8" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_collections.js?v=8" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_lists_unified.js?v=8" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_extras.js?v=9" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_collections.js?v=9" type="text/javascript"></script>
<script src="<?cs var:toroot ?>jd_tag_helpers.js?v=5" type="text/javascript"></script>
</body>

View File

@ -38,7 +38,7 @@ if:android.whichdoc != 'online' ?>http:<?cs
if:android.whichdoc != 'online' ?>http:<?cs
/if ?>//fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold"
title="roboto">
<link href="<?cs var:toroot ?>assets/css/default.css?v=4" rel="stylesheet" type="text/css">
<link href="<?cs var:toroot ?>assets/css/default.css?v=5" rel="stylesheet" type="text/css">
<?cs if:reference && !(reference.gms || reference.gcm || preview) ?>
<!-- FULLSCREEN STYLESHEET -->