commit 05d14cb9f03044e11f7c056dae1e576bb5cd3716
author Scott Main <smain@google.com> Fri Jan 21 12:00:51 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 21 12:00:51 2011 -0800
tree e1672e15e64511b4e150a9e3b805c4df01bc8623
parent 50738779d90970a3e36fe40a78df724946f323db
parent 42d1d32aa02196b1a8a203f3d7210989c1ac2a39

Merge "don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread

tools/droiddoc/src/DocFile.java

diff --git a/tools/droiddoc/src/DocFile.java b/tools/droiddoc/src/DocFile.java
index cc7a8cf..180fdcd 100644
--- a/tools/droiddoc/src/DocFile.java
+++ b/tools/droiddoc/src/DocFile.java
@@ -129,7 +129,7 @@
         } else {
             if (outfile.indexOf("sdk/") != -1) {
                 hdf.setValue("sdk", "true");
-                if ((outfile.indexOf("index.html") != -1) || (outfile.indexOf("features.html") != -1)) {
+                if ((outfile.indexOf("index.html") != -1) && (outfile.indexOf("preview/") == -1)) {
                     ClearPage.write(hdf, "sdkpage.cs", outfile);
                 } else {
                     ClearPage.write(hdf, "docpage.cs", outfile);