AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories

  BUG=1790234

Automated import of CL 150393

diff --git a/tools/droiddoc/templates/assets/navtree.js b/tools/droiddoc/templates/assets/navtree.js
index f48e1dc..a209d12 100644 (file)
--- a/tools/droiddoc/templates/assets/navtree.js
+++ b/tools/droiddoc/templates/assets/navtree.js
@@ -104,7 +104,8 @@ function this_page_relative(toroot)
   var file = "";
   if (toroot.substr(0, 1) == "/") {
     if (full.substr(0, toroot.length) == toroot) {
-      return full.substr(toroot.length);
+      var basePath = getBaseUri(full);
+      return basePath.substring(toroot.length);
     } else {
       // the file isn't under toroot.  Fail.
       return null;