Changes for dac2 designandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-dev

Change-Id: I755581b3db5664d3db429185bb18de1ad7a471cb

2 files changed, 30 insertions, 17 deletions

diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs
index f3188f4..db958cd 100644
--- a/res/assets/templates/macros.cs
+++ b/res/assets/templates/macros.cs
@@ -139,7 +139,7 @@ def:see_also_tags(also) ?><?cs
 <?cs # print the API Level ?><?cs
 def:since_tags(obj) ?>
 <?cs if:reference.apilevels && obj.since ?>
-  Since: <a href="<?cs var:toroot ?>guide/appendix/api-levels.html#level<?cs var:obj.since ?>">API Level <?cs var:obj.since ?></a>
+  Since: <a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html#ApiLevels">API Level <?cs var:obj.since ?></a>
 <?cs /if ?>
 <?cs /def ?>
 <?cs def:federated_refs(obj) ?>
diff --git a/src/com/google/doclava/DocFile.java b/src/com/google/doclava/DocFile.java
index 4dd81bc..d450224 100644
--- a/src/com/google/doclava/DocFile.java
+++ b/src/com/google/doclava/DocFile.java
@@ -120,24 +120,37 @@ public class DocFile {
       // for custom left nav based on tab etc.
       ClearPage.write(hdf, "docpage.cs", outfile);
     } else {
-      if (outfile.indexOf("sdk/") != -1) {
-        hdf.setValue("sdk", "true");
-        if ((outfile.indexOf("index.html") != -1) && (outfile.indexOf("preview/") == -1)) {
-          ClearPage.write(hdf, "sdkpage.cs", outfile);
-        } else {
-          ClearPage.write(hdf, "docpage.cs", outfile);
-        }
-      } else if (outfile.indexOf("guide/") != -1) {
-        hdf.setValue("guide", "true");
-        ClearPage.write(hdf, "docpage.cs", outfile);
-      } else if ((outfile.indexOf("resources/") != -1) || (outfile.indexOf("training/") != -1)) {
-        hdf.setValue("resources", "true");
-        ClearPage.write(hdf, "docpage.cs", outfile);
-      } else if (outfile.indexOf("design/") != -1) {
+      String filename = outfile;
+      // Check whether this is a localized page and remove the intl/*/ path from filename
+      if (filename.indexOf("intl/") == 0) {
+        filename = filename.substring(filename.indexOf("/", 5) + 1); // After intl/ to get 2nd /
+      }
+      if (filename.indexOf("design/") == 0) {
         hdf.setValue("design", "true");
-        ClearPage.write(hdf, "designpage.cs", outfile);
+      } else if (filename.indexOf("develop/") == 0) {
+        hdf.setValue("develop", "true");
+      } else if (filename.indexOf("guide/") == 0) {
+        hdf.setValue("guide", "true");
+      } else if (filename.indexOf("training/") == 0) {
+        hdf.setValue("training", "true");
+      } else if (filename.indexOf("more/") == 0) {
+        hdf.setValue("more", "true");
+      } else if (filename.indexOf("google/") == 0) {
+        hdf.setValue("google", "true");
+      } else if (filename.indexOf("distribute/") == 0) {
+        hdf.setValue("distribute", "true");
+      } else if (filename.indexOf("about/") == 0) {
+        hdf.setValue("about", "true");
+      } else if ((filename.indexOf("tools/") == 0) || (filename.indexOf("sdk/") == 0)) {
+        hdf.setValue("tools", "true");
+      }
+
+      if ((filename.indexOf("tools/sdk/preview/index.html") == 0) ||
+          (filename.indexOf("sdk/index.html") == 0) ||
+          (filename.indexOf("tools/sdk/ndk/index.html") == 0)) {
+        ClearPage.write(hdf, "sdkpage.cs", outfile);
       } else {
-        ClearPage.write(hdf, "nosidenavpage.cs", outfile);
+        ClearPage.write(hdf, "docpage.cs", outfile);
       }
     }
   } // writePage