diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-07 08:23:36 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-07 08:23:36 +0000 |
| commit | af9e3ed485dd4325dd787521eea3396fb658e9a7 (patch) | |
| tree | 4829f962f76bb54cb52f4e09332bd6910ad2a456 | |
| parent | 217247a5c9ccd52e035b8bca3aa5c8b4e1b1025a (diff) | |
| parent | 2985b3765bbce142467cff158e962e43de7df31d (diff) | |
| download | platform_external_doclava-af9e3ed485dd4325dd787521eea3396fb658e9a7.tar.gz platform_external_doclava-af9e3ed485dd4325dd787521eea3396fb658e9a7.tar.bz2 platform_external_doclava-af9e3ed485dd4325dd787521eea3396fb658e9a7.zip | |
Snap for 4638586 from 2985b3765bbce142467cff158e962e43de7df31d to pi-release
Change-Id: I148a4f764b7d9ec66ad8a393dc9b073645371b7b
| -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); |