From 48a1b47fa18056cd30453b06739ebc02a0296186 Mon Sep 17 00:00:00 2001 From: Xiaotao Duan Date: Thu, 3 Sep 2009 00:33:36 -0700 Subject: AI 151288: Use zh ICU data for products with locale zh BUG=2056471 Automated import of CL 151288 --- tools/droiddoc/templates-sdk/sdkpage.cs | 4 ++-- tools/droiddoc/templates/assets/android-developer-docs.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs index d5c9ffc8b0..f7ff220ef4 100644 --- a/tools/droiddoc/templates-sdk/sdkpage.cs +++ b/tools/droiddoc/templates-sdk/sdkpage.cs @@ -5,8 +5,8 @@ Redirecting... /index.html" + if:sdk.redirect.path ?>/index.html"> diff --git a/tools/droiddoc/templates/assets/android-developer-docs.js b/tools/droiddoc/templates/assets/android-developer-docs.js index af1b700cee..1979cffc7c 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.js +++ b/tools/droiddoc/templates/assets/android-developer-docs.js @@ -145,8 +145,8 @@ function highlightNav(fullPageName) { var htmlPos = fullPageName.lastIndexOf(".html", fullPageName.length); var pathPageName = fullPageName.slice(firstSlashPos, htmlPos + 5); var link = $("#devdoc-nav a[href$='"+ pathPageName+"']"); - if ((link.length == 0) && ((fullPageName.indexOf("/guide/") != -1) || (fullPageName.indexOf("/sdk/") != -1))) { -// if there's no match, then let's backstep through the directory until we find an index.html page that matches our ancestor directories (only for dev guide and sdk) + if ((link.length == 0) && (fullPageName.indexOf("/guide/") != -1)) { +// if there's no match, then let's backstep through the directory until we find an index.html page that matches our ancestor directories (only for dev guide) lastBackstep = pathPageName.lastIndexOf("/"); while (link.length == 0) { backstepDirectory = pathPageName.lastIndexOf("/", lastBackstep); -- cgit v1.2.3