diff options
author | Dirk Dougherty <ddougherty@google.com> | 2015-05-18 18:49:35 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-18 18:49:35 +0000 |
commit | fd2d4fc975f75a8df5b7cbcd1cca893ba3239dc7 (patch) | |
tree | db85da719d18ea282459c75a4977117b61ad9e77 /tools/droiddoc | |
parent | e9ec053e992a2cce6e0688ad1711b015372c24ae (diff) | |
parent | 9cf9a6c6dcd9d58024dc115a703feb7bc47098bd (diff) | |
download | build-fd2d4fc975f75a8df5b7cbcd1cca893ba3239dc7.zip build-fd2d4fc975f75a8df5b7cbcd1cca893ba3239dc7.tar.gz build-fd2d4fc975f75a8df5b7cbcd1cca893ba3239dc7.tar.bz2 |
am 9cf9a6c6: am a8bbfca3: Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
* commit '9cf9a6c6dcd9d58024dc115a703feb7bc47098bd':
Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
Diffstat (limited to 'tools/droiddoc')
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/js/docs.js | 2 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk/components/masthead.cs | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js index 60bbaf9..2efe3dc 100644 --- a/tools/droiddoc/templates-sdk/assets/js/docs.js +++ b/tools/droiddoc/templates-sdk/assets/js/docs.js @@ -186,6 +186,8 @@ $(document).ready(function() { subNavEl.find("li.google > a").addClass("selected"); } else if ($("body").hasClass("samples")) { subNavEl.find("li.samples > a").addClass("selected"); + } else if ($("body").hasClass("preview")) { + subNavEl.find("li.preview > a").addClass("selected"); } else { parentNavEl.removeClass('has-subnav').addClass("selected"); } diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs index 9e6a645..000d95f 100644 --- a/tools/droiddoc/templates-sdk/components/masthead.cs +++ b/tools/droiddoc/templates-sdk/components/masthead.cs @@ -103,7 +103,7 @@ <a class="dac-nav-link dac-visible-mobile-block" href="<?cs var:toroot ?>index.html">Home</a> <ul class="dac-nav-secondary about"> <li class="dac-nav-item about"> - <a class="dac-nav-link" href="<?cs var:toroot ?>about/index.html">About</a> + <a class="dac-nav-link" href="<?cs var:toroot ?>about/index.html">Android</a> </li> <li class="dac-nav-item wear"> <a class="dac-nav-link" href="<?cs var:toroot ?>wear/index.html">Wear</a> @@ -178,7 +178,7 @@ </li> <?cs /if ?> <li class="dac-nav-item preview"> - <a class="dac-nav-link" href="<?cs var:toroot ?>preview/index.html">M Preview</a> + <a class="dac-nav-link" href="<?cs var:toroot ?>preview/index.html">Preview</a> </li> </ul> </li> @@ -200,14 +200,11 @@ <li class="dac-nav-item engage"> <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/engage/index.html">Engage & Retain</a></li> <li class="dac-nav-item monetize"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/monetize/index.html">Monetize</a> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/monetize/index.html">Earn</a> </li> <li class="dac-nav-item analyze"> <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/analyze/index.html">Analyze</a> </li> - <li class="dac-nav-item disttools"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/tools/index.html">Tools</a> - </li> <li class="dac-nav-item stories"> <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/stories/index.html">Stories</a> </li> |