diff --git a/tools/droiddoc/src/DocFile.java b/tools/droiddoc/src/DocFile.java index 990133061d..51072dfa94 100644 --- a/tools/droiddoc/src/DocFile.java +++ b/tools/droiddoc/src/DocFile.java @@ -137,6 +137,9 @@ public class DocFile } else if (outfile.indexOf("guide/") != -1) { hdf.setValue("guide", "true"); ClearPage.write(hdf, "docpage.cs", outfile); + } else if (outfile.indexOf("resources/") != -1) { + hdf.setValue("resources", "true"); + ClearPage.write(hdf, "resourcespage.cs", outfile); } else { ClearPage.write(hdf, "nosidenavpage.cs", outfile); } diff --git a/tools/droiddoc/src/SampleCode.java b/tools/droiddoc/src/SampleCode.java index 1f00be2313..bf544454e4 100644 --- a/tools/droiddoc/src/SampleCode.java +++ b/tools/droiddoc/src/SampleCode.java @@ -44,7 +44,7 @@ public class SampleCode { System.out.println("-samplecode not a directory: " + mSource); return; } - if (offlineMode) writeIndexOnly(f, mDest); + if (offlineMode) writeIndexOnly(f, mDest, offlineMode); else writeDirectory(f, mDest); } @@ -118,9 +118,10 @@ public class SampleCode { ClearPage.write(hdf, "sampleindex.cs", relative + "/index" + DroidDoc.htmlExtension); } - public void writeIndexOnly(File dir, String relative) { + public void writeIndexOnly(File dir, String relative, Boolean offline) { HDF hdf = writeIndex(dir); - ClearPage.write(hdf, "sampleindex.cs", relative + "/index" + + if (!offline) relative = "/" + relative; + ClearPage.write(hdf, "sampleindex.cs", relative + "index" + DroidDoc.htmlExtension); } diff --git a/tools/droiddoc/templates-sdk/customization.cs b/tools/droiddoc/templates-sdk/customization.cs index 6ae8446622..34f559503e 100644 --- a/tools/droiddoc/templates-sdk/customization.cs +++ b/tools/droiddoc/templates-sdk/customization.cs @@ -108,6 +108,21 @@ def:sdk_nav() ?> + +
+
+
+
+
+ + +
@@ -196,6 +211,8 @@ def:default_left_nav() ?> def:custom_left_nav() ?>guidesdkhomecommunityresourcesvideos"> -
  • +
    • -
  • - Community + Blog - - + + - - - + + +
    • + + diff --git a/tools/droiddoc/templates-sdk/resourcespage.cs b/tools/droiddoc/templates-sdk/resourcespage.cs new file mode 100644 index 0000000000..526d7daf0a --- /dev/null +++ b/tools/droiddoc/templates-sdk/resourcespage.cs @@ -0,0 +1,31 @@ + + + + + + + + + + +
    +
    +   +

    +
    + +
    + + + + + +
    + + + + + + + + diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css index daa705b7ae..1fc819cd15 100644 --- a/tools/droiddoc/templates/assets/android-developer-core.css +++ b/tools/droiddoc/templates/assets/android-developer-core.css @@ -268,7 +268,7 @@ hr.blue { .guide #guide-link a, .reference #reference-link a, .sdk #sdk-link a, -.community #community-link a, +.resources #resources-link a, .videos #videos-link a { background-image: url(images/bg_images_sprite.png); background-position: 0 0; @@ -282,7 +282,7 @@ hr.blue { .guide #guide-link a:hover, .reference #reference-link a:hover, .sdk #sdk-link a:hover, -.community #community-link a:hover, +.resources #resources-link a:hover, .videos #videos-link a:hover { background-image: url(images/bg_images_sprite.png); background-position: 0 0; diff --git a/tools/droiddoc/templates/assets/android-developer-docs.js b/tools/droiddoc/templates/assets/android-developer-docs.js index 7b26efdbf1..95099a3a02 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.js +++ b/tools/droiddoc/templates/assets/android-developer-docs.js @@ -140,6 +140,8 @@ function init() { var cookiePath = "reference_"; } else if (location.href.indexOf("/guide/") != -1) { var cookiePath = "guide_"; + } else if (location.href.indexOf("/resources/") != -1) { + var cookiePath = "resources_"; } if (!isMobile) { @@ -166,9 +168,14 @@ function init() { function highlightNav(fullPageName) { var lastSlashPos = fullPageName.lastIndexOf("/"); - var firstSlashPos = (fullPageName.indexOf("/guide/") != -1) ? - fullPageName.indexOf("/guide/") : - fullPageName.indexOf("/sdk/"); // first slash after /guide or /sdk + var firstSlashPos; + if (fullPageName.indexOf("/guide/") != -1) { + firstSlashPos = fullPageName.indexOf("/guide/"); + } else if (fullPageName.indexOf("/sdk/") != -1) { + firstSlashPos = fullPageName.indexOf("/sdk/"); + } else { + firstSlashPos = fullPageName.indexOf("/resources/"); + } if (lastSlashPos == (fullPageName.length - 1)) { // if the url ends in slash (add 'index.html') fullPageName = fullPageName + "index.html"; } @@ -228,6 +235,8 @@ function resizeHeight() { // If in the dev guide docs, also resize the "devdoc-nav" div } else if (href.indexOf("/guide/") != -1) { $("#devdoc-nav").css({height:sidenav.css("height")}); + } else if (href.indexOf("/resources/") != -1) { + $("#devdoc-nav").css({height:sidenav.css("height")}); } } @@ -308,6 +317,8 @@ $(window).unload(function(){ writeCookie("lastpage", path, "reference", null); } else if (path.indexOf("/guide/") != -1) { writeCookie("lastpage", path, "guide", null); + } else if (path.indexOf("/resources/") != -1) { + writeCookie("lastpage", path, "resources", null); } }); diff --git a/tools/droiddoc/templates/docpage.cs b/tools/droiddoc/templates/docpage.cs index 06b3f3598e..9d85c6fd96 100644 --- a/tools/droiddoc/templates/docpage.cs +++ b/tools/droiddoc/templates/docpage.cs @@ -19,7 +19,6 @@
    -
    diff --git a/tools/droiddoc/templates/head_tag.cs b/tools/droiddoc/templates/head_tag.cs index 3a5540d6d4..5a7fd40401 100644 --- a/tools/droiddoc/templates/head_tag.cs +++ b/tools/droiddoc/templates/head_tag.cs @@ -5,7 +5,7 @@ if:page.title ?> | Android Developers +if:guide||sdk||resources ?> - + + -
    -
    - - - Sample Code > - - -

    -
    + +
    +
    +   +

    +
    diff --git a/tools/droiddoc/templates/sampleindex.cs b/tools/droiddoc/templates/sampleindex.cs index 9842384b6c..8a752986d6 100644 --- a/tools/droiddoc/templates/sampleindex.cs +++ b/tools/droiddoc/templates/sampleindex.cs @@ -1,20 +1,18 @@ - + + -
    -
    - - - Sample Code > - - -

    -
    + +
    +
    +   +

    +
    @@ -54,8 +52,10 @@ -
    + + +