commit a8bbfca3d0ba7da40f9348eeb38badda575fe411
author Dirk Dougherty <ddougherty@google.com> Thu May 14 22:58:28 2015 -0700
committer Dirk Dougherty <ddougherty@google.com> Fri May 15 17:05:38 2015 -0700
tree e8ba2220d5406911bb2cc7927154539851cec676
parent 2f9407e197242eb3a9db188f901369e09e11a152

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.

Change-Id: I80124a8a05311976a7c373dfdaf5bb984a9c3bc7

tools/droiddoc/templates-sdk/assets/js/docs.js

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 @@
       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");
     }

tools/droiddoc/templates-sdk/components/masthead.cs

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 &amp; 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>