diff options
| author | Scott Main <smain@google.com> | 2018-03-06 11:33:31 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2018-03-06 11:59:20 -0800 |
| commit | 9be062c129fe782bf22c761769e805acb160446a (patch) | |
| tree | 3a0eacb669e849505f4451b88afaaab187f3ed0b | |
| parent | 5880fe8bc7736d15dd4d2d98293bdaf330ca115d (diff) | |
| download | platform_external_doclava-9be062c129fe782bf22c761769e805acb160446a.tar.gz platform_external_doclava-9be062c129fe782bf22c761769e805acb160446a.tar.bz2 platform_external_doclava-9be062c129fe782bf22c761769e805acb160446a.zip | |
Add quotes and don't include 'version_added' if there's no 'since' info
Also remove now-unecessary 'no-toggle' class from left nav items.
bug: b/70844489
test: make ds-docs
Change-Id: I88cc7cde9de1871fd5abdf2fae94dfb5e47912b7
| -rw-r--r-- | res/assets/templates-sdk/yaml_navtree2.cs | 8 | ||||
| -rw-r--r-- | src/com/google/doclava/NavTree.java | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/res/assets/templates-sdk/yaml_navtree2.cs b/res/assets/templates-sdk/yaml_navtree2.cs index a8ec241..66ef5aa 100644 --- a/res/assets/templates-sdk/yaml_navtree2.cs +++ b/res/assets/templates-sdk/yaml_navtree2.cs @@ -2,14 +2,8 @@ toc: <?cs if:docs.packages.link ?> - title: Class Index - path: /<?cs var:docs.classes.link ?><?cs - if:dac ?> - status_text: no-toggle<?cs - /if?> + path: /<?cs var:docs.classes.link ?> - title: Package Index path: /<?cs var:docs.packages.link ?><?cs - if:dac ?> - status_text: no-toggle<?cs - /if?><?cs /if ?> <?cs var:reference_tree ?>
\ No newline at end of file diff --git a/src/com/google/doclava/NavTree.java b/src/com/google/doclava/NavTree.java index ee7dbde..7de6196 100644 --- a/src/com/google/doclava/NavTree.java +++ b/src/com/google/doclava/NavTree.java @@ -341,10 +341,12 @@ public class NavTree { buf.append("\n" + getIndent(depth)); buf.append(" path: "); renderStringYaml(buf, "/" + mLink); - // and the API level also only makes sense if there's a link - buf.append("\n" + getIndent(depth)); - buf.append(" version_added: "); - renderStringYaml(buf, mSince); + // add the API level info only if we have it + if (mSince != null) { + buf.append("\n" + getIndent(depth)); + buf.append(" version_added: "); + renderStringYaml(buf, "'" + mSince + "'"); + } } // try rendering child Nodes renderChildrenYaml(buf, depth + 1); |