diff options
| author | Xiaotao Duan <nobody@android.com> | 2009-09-03 00:33:36 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-09-03 00:33:36 -0700 |
| commit | 48a1b47fa18056cd30453b06739ebc02a0296186 (patch) | |
| tree | fb0502066b6f4357c9ac0f2cc0ec1a160d9b9953 | |
| parent | 5db40c6db73db3f4433dd3456107efb4468a4a99 (diff) | |
| download | build-cupcake.tar.gz | |
AI 151288: Use zh ICU data for products with locale zhcupcake
BUG=2056471
Automated import of CL 151288
| -rw-r--r-- | tools/droiddoc/templates-sdk/sdkpage.cs | 4 | ||||
| -rw-r--r-- | 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 @@ <head> <title>Redirecting...</title> <meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs - if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?>"<?cs - else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>" + if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?><?cs + else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>"> <link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" /> </head> <?cs else ?> 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); |