From c521e266406d0393313e17ba29ae519315a5cf6e Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Fri, 1 May 2009 11:19:55 -0700 Subject: [PATCH] AI 148186: Add support for using custom pdk templates. The make rule for pdk docs should set LOCAL_DROIDDOC_OPTIONS += -hdf android.whichdoc online-pdk BUG=1646802 Automated import of CL 148186 --- tools/droiddoc/src/DocFile.java | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/tools/droiddoc/src/DocFile.java b/tools/droiddoc/src/DocFile.java index f53a35ce8..b71c0816e 100644 --- a/tools/droiddoc/src/DocFile.java +++ b/tools/droiddoc/src/DocFile.java @@ -115,23 +115,30 @@ public class DocFile TagInfo.makeHDF(hdf, "root.descr", tags); hdf.setValue("commentText", commentText); - - if (outfile.indexOf("sdk/") != -1) { - hdf.setValue("sdk", "true"); - if (outfile.indexOf("index.html") != -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("publish/") != -1){ - hdf.setValue("publish", "true"); + + // write the page using the appropriate root template, based on the + // whichdoc value supplied by build + String fromWhichmodule = hdf.getValue("android.whichmodule", ""); + if (fromWhichmodule.equals("online-pdk")) { + //leaving this in just for temporary compatibility with pdk doc + hdf.setValue("online-pdk", "true"); + // add any conditional login for root template here (such as + // for custom left nav based on tab etc. ClearPage.write(hdf, "docpage.cs", outfile); } else { - ClearPage.write(hdf, "nosidenavpage.cs", outfile); + if (outfile.indexOf("sdk/") != -1) { + hdf.setValue("sdk", "true"); + if (outfile.indexOf("index.html") != -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 { + ClearPage.write(hdf, "nosidenavpage.cs", outfile); + } } - } - + } //writePage } -- 2.11.0