diff options
| author | Scott Main <smain@google.com> | 2018-03-06 23:11:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-06 23:11:09 +0000 |
| commit | 2985b3765bbce142467cff158e962e43de7df31d (patch) | |
| tree | 4829f962f76bb54cb52f4e09332bd6910ad2a456 | |
| parent | cbdd3b49a2ade97fa5df36b2eb3f042570e9bb13 (diff) | |
| parent | 9be062c129fe782bf22c761769e805acb160446a (diff) | |
| download | doclava-2985b3765bbce142467cff158e962e43de7df31d.tar.gz | |
Add quotes and don't include 'version_added' if there's no 'since' info
am: 9be062c129
Change-Id: Id00ce773ebe77cb775f5719b48a0f8483f7b0722
| -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 72a396c..b4861c8 100644 --- a/src/com/google/doclava/NavTree.java +++ b/src/com/google/doclava/NavTree.java @@ -342,10 +342,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); |