diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-03 07:27:37 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-03 07:27:37 +0000 |
commit | 48d4a193fb97f86f468098cb346e41ae6403767c (patch) | |
tree | dbf47f05f1828489d9a85e04b69751320b21fc65 | |
parent | af9e3ed485dd4325dd787521eea3396fb658e9a7 (diff) | |
parent | 3637c6ebf6d5eca4ad12679f414c7bc60e60b4b5 (diff) | |
download | platform_external_doclava-48d4a193fb97f86f468098cb346e41ae6403767c.tar.gz platform_external_doclava-48d4a193fb97f86f468098cb346e41ae6403767c.tar.bz2 platform_external_doclava-48d4a193fb97f86f468098cb346e41ae6403767c.zip |
Snap for 4696032 from 3637c6ebf6d5eca4ad12679f414c7bc60e60b4b5 to pi-release
Change-Id: I4ff284cb503bffa06c0505f429c5e4342b581751
-rw-r--r-- | res/assets/templates-sdk/class.cs | 139 | ||||
-rw-r--r-- | res/assets/templates-sdk/page_info.cs | 1 | ||||
-rw-r--r-- | res/assets/templates/macros.cs | 64 |
3 files changed, 78 insertions, 126 deletions
diff --git a/res/assets/templates-sdk/class.cs b/res/assets/templates-sdk/class.cs index 776d2b2..61ca4fa 100644 --- a/res/assets/templates-sdk/class.cs +++ b/res/assets/templates-sdk/class.cs @@ -235,7 +235,7 @@ <p><b>Related methods:</b></p> <ul class="nolist"> <?cs each:m=attr.methods ?> - <li><a href="<?cs var:toroot ?><?cs var:m.href ?>"><?cs var:m.name ?></a></li> + <li><code><a href="<?cs var:toroot ?><?cs var:m.href ?>"><?cs var:m.name ?></a></code></li> <?cs /each ?> </ul> <?cs /if ?> @@ -341,14 +341,11 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> <table class="jd-sumtable jd-sumtable-subclasses"> <tr> - <td style="border:none;margin:0;padding:0;"><?cs - if:enable_javascript ?> - <?cs call:expando_trigger("subclasses-direct", "closed") ?><span>Known Direct Subclasses</span> - <?cs call:expandable_class_list("subclasses-direct", class.subclasses.direct, "list") ?><?cs - else ?> - <span>Known Direct Subclasses</span> - <?cs call:expandable_class_list("subclasses-direct", class.subclasses.direct, "summary") ?><?cs - /if ?> + <td> + <div class="expandable"> + <span class="expand-control">Known direct subclasses</span> + <?cs call:expandable_class_list("subclasses-direct", class.subclasses.direct, "list") ?> + </div> </td> </tr> </table> @@ -356,14 +353,11 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> <?cs if:subcount(class.subclasses.indirect) && !class.subclasses.hidden ?> <table class="jd-sumtable jd-sumtable-subclasses"> <tr> - <td colspan="2" style="border:none;margin:0;padding:0;"><?cs - if:enable_javascript ?> - <?cs call:expando_trigger("subclasses-indirect", "closed") ?><span>Known Indirect Subclasses</span> - <?cs call:expandable_class_list("subclasses-indirect", class.subclasses.indirect, "list") ?><?cs - else ?> - <span>Known Indirect Subclasses</span> - <?cs call:expandable_class_list("subclasses-indirect", class.subclasses.indirect, "summary") ?><?cs - /if ?> + <td> + <div class="expandable"> + <span class="expand-control">Known indirect subclasses</span> + <?cs call:expandable_class_list("subclasses-indirect", class.subclasses.indirect, "list") ?> + </div> </td> </tr> </table><?cs @@ -436,23 +430,15 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> if:cl.deprecatedsince ?> data-version-deprecated="<?cs var:cl.deprecatedsince ?>"<?cs /if ?> > -<td colspan="2"><?cs - if:enable_javascript ?><?cs - call:expando_trigger("inherited-attrs-"+cl.qualified, "closed") ?><?cs - /if ?>From -<?cs var:cl.kind ?> -<code> - <?cs call:cond_link(cl.qualified, toroot, cl.link, cl.included) ?> -</code> -<div id="inherited-attrs-<?cs var:cl.qualified ?>"> - <div id="inherited-attrs-<?cs var:cl.qualified ?>-list" - class="jd-inheritedlinks"> - </div> - <div id="inherited-attrs-<?cs var:cl.qualified ?>-summary" style="display: none;"> - <table class="jd-sumtable-expando"> - <?cs call:write_attr_summary(cl.attrs, cl.included) ?></table> +<td colspan="2"> + <div class="expandable jd-inherited-apis"> + <span class="expand-control">From <?cs var:cl.kind ?> + <code><?cs call:cond_link(cl.qualified, toroot, cl.link, cl.included) ?></code> + </span> + <table class="responsive"> + <?cs call:write_attr_summary(cl.attrs, cl.included) ?> + </table> </div> -</div> </td></tr> <?cs /if ?> <?cs /each ?> @@ -508,23 +494,15 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> if:cl.deprecatedsince ?> data-version-deprecated="<?cs var:cl.deprecatedsince ?>"<?cs /if ?> > - <td><?cs - if:enable_javascript ?><?cs - call:expando_trigger("inherited-constants-"+cl.qualified, "closed") ?><?cs - /if ?>From - <?cs var:cl.kind ?> - <code> - <?cs call:cond_link(cl.qualified, toroot, cl.link, cl.included) ?> - </code> - <div id="inherited-constants-<?cs var:cl.qualified ?>"> - <div id="inherited-constants-<?cs var:cl.qualified ?>-list" - class="jd-inheritedlinks"> + <td> + <div class="expandable jd-inherited-apis"> + <span class="expand-control">From <?cs var:cl.kind ?> + <code><?cs call:cond_link(cl.qualified, toroot, cl.link, cl.included) ?></code> + </span> + <table class="responsive"> + <?cs call:write_constant_summary(cl.constants, cl.included) ?> + </table> </div> - <div id="inherited-constants-<?cs var:cl.qualified ?>-summary" style="display: none;"> - <table class="jd-sumtable-expando responsive"> - <?cs call:write_constant_summary(cl.constants, cl.included) ?></table> - </div> - </div> </td></tr> <?cs /if ?> <?cs /each ?> @@ -544,7 +522,7 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> <?cs if:inhfields ?> <?cs # this next line must be exactly like this to be parsed by eclipse ?> <!-- =========== FIELD SUMMARY =========== --> -<table id="inhfields" class="properties inhtable"> +<table id="inhfields" class="responsive properties inhtable"> <tr><th><h3>Inherited fields</h3></th></tr> <?cs each:cl=class.inherited ?> <?cs if:subcount(cl.fields) ?> @@ -555,23 +533,15 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> if:cl.deprecatedsince ?> data-version-deprecated="<?cs var:cl.deprecatedsince ?>"<?cs /if ?> > - <td><?cs - if:enable_javascript ?><?cs - call:expando_trigger("inherited-fields-"+cl.qualified, "closed") ?><?cs - /if ?>From - <?cs var:cl.kind ?> - <code> - <?cs call:cond_link(cl.qualified, toroot, cl.link, cl.included) ?> - </code> - <div id="inherited-fields-<?cs var:cl.qualified ?>"> - <div id="inherited-fields-<?cs var:cl.qualified ?>-list" - class="jd-inheritedlinks"> - </div> - <div id="inherited-fields-<?cs var:cl.qualified ?>-summary" style="display: none;"> - <table class="jd-sumtable-expando responsive"> - <?cs call:write_field_summary(cl.fields, cl.included) ?></table> + <td> + <div class="expandable jd-inherited-apis"> + <span class="expand-control">From <?cs var:cl.kind ?> + <code><?cs call:cond_link(cl.qualified, toroot, cl.link, cl.included) ?></code> + </span> + <table class="responsive"> + <?cs call:write_field_summary(cl.fields, cl.included) ?> + </table> </div> - </div> </td></tr> <?cs /if ?> <?cs /each ?> @@ -618,7 +588,7 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> <?cs if:inhmethods ?> <?cs # this next line must be exactly like this to be parsed by eclipse ?> <!-- ========== METHOD SUMMARY =========== --> -<table id="inhmethods" class="methods inhtable"> +<table id="inhmethods" class="responsive methods inhtable"> <tr><th><h3>Inherited methods</h3></th></tr> <?cs each:cl=class.inherited ?> <?cs if:subcount(cl.methods) ?> @@ -629,30 +599,23 @@ if:subcount(class.subclasses.direct) && !class.subclasses.hidden ?> if:cl.deprecatedsince ?> data-version-deprecated="<?cs var:cl.deprecatedsince ?>"<?cs /if ?> > -<td colspan="2"><?cs - if:enable_javascript ?><?cs - call:expando_trigger("inherited-methods-"+cl.qualified, "closed") ?><?cs - /if ?>From -<?cs var:cl.kind ?> -<code> - <?cs if:cl.included ?> - <a href="<?cs var:toroot ?><?cs var:cl.link ?>"><?cs var:cl.qualified ?></a> - <?cs elif:cl.federated ?> - <a href="<?cs var:cl.link ?>"><?cs var:cl.qualified ?></a> - <?cs else ?> - <?cs var:cl.qualified ?> - <?cs /if ?> -</code> -<div id="inherited-methods-<?cs var:cl.qualified ?>"> - <div id="inherited-methods-<?cs var:cl.qualified ?>-list" - class="jd-inheritedlinks"> - </div> - <div id="inherited-methods-<?cs var:cl.qualified ?>-summary" style="display: none;"> - <table class="jd-sumtable-expando responsive"> +<td colspan="2"> + <div class="expandable jd-inherited-apis"> + <span class="expand-control">From <?cs var:cl.kind ?> + <code> + <?cs if:cl.included ?> + <a href="<?cs var:toroot ?><?cs var:cl.link ?>"><?cs var:cl.qualified ?></a> + <?cs elif:cl.federated ?> + <a href="<?cs var:cl.link ?>"><?cs var:cl.qualified ?></a> + <?cs else ?> + <?cs var:cl.qualified ?> + <?cs /if ?> + </code> + </span> + <table class="responsive"> <?cs call:write_method_summary(cl.methods, cl.included) ?> </table> </div> -</div> </td></tr> <?cs /if ?> <?cs /each ?> diff --git a/res/assets/templates-sdk/page_info.cs b/res/assets/templates-sdk/page_info.cs index 3b7fbc4..8585ee1 100644 --- a/res/assets/templates-sdk/page_info.cs +++ b/res/assets/templates-sdk/page_info.cs @@ -108,7 +108,6 @@ Summary: <?cs if:inhmethods ?> <?cs if:linkcount ?>| <?cs /if ?><a href="#inhmethods">Inherited Methods</a> <?cs /if ?> -| <a href="#" onclick="return toggleAllClassInherited()" id="toggleAllClassInherited">[Expand All]</a> <?cs /if ?> </div><!-- end sum-details-links --> </div><!-- end api-info-block --><?cs diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs index cf8c86e..e845db2 100644 --- a/res/assets/templates/macros.cs +++ b/res/assets/templates/macros.cs @@ -304,7 +304,7 @@ def:description(obj) ?><?cs call:aux_tag_list(obj.descrAux) ?><?cs if:subcount(obj.annotationdocumentation)?><?cs each:annodoc=obj.annotationdocumentation ?> - <div style="display:block"><?cs var:annodoc.text?></div><?cs + <div><?cs var:annodoc.text?></div><?cs /each?><?cs /if?><?cs if:subcount(obj.attrRefs) ?> <p><b>Related XML Attributes:</b></p> @@ -395,7 +395,7 @@ def:class_link_table(classes) ?><?cs # A list of links to classes, for use in the side navigation of classes when viewing a package (panel nav) ?><?cs def:class_link_list(label, classes) ?><?cs if:subcount(classes) ?> - <li><h2><?cs var:label ?></h2> + <li><h2 class="hide-from-toc"><?cs var:label ?></h2> <ul><?cs each:cl=classes ?> <li class="api apilevel-<?cs var:cl.type.since ?>"><?cs call:type_link2(cl.type,"true") ?></li><?cs @@ -408,7 +408,7 @@ def:class_link_list(label, classes) ?><?cs # A list of links to classes, for use in the side navigation of classes when viewing a class (panel nav) ?><?cs def:list(label, classes) ?><?cs if:subcount(classes) ?> - <li><h2><?cs var:label ?></h2> + <li><h2 class="hide-from-toc"><?cs var:label ?></h2> <ul><?cs each:cl=classes ?> <li class="<?cs if:class.name == cl.label?>selected <?cs /if ?>api apilevel-<?cs var:cl.since ?>"><?cs call:type_link2(cl,"true") ?></li><?cs @@ -444,40 +444,30 @@ def:expando_trigger(id, default) ?> # An expandable list of classes ?><?cs def:expandable_class_list(id, classes, default) ?> - <div id="<?cs var:id ?>"> - <div id="<?cs var:id ?>-list" class="jd-inheritedlinks"<?cs - if:default != "list" ?> - style="display: none;"<?cs - /if ?> > <?cs - if:subcount(classes) <= #20 ?><?cs - each:cl=classes ?><?cs - call:type_link(cl.type) ?><?cs - if:!last(cl) - ?>,<?cs - /if ?><?cs - /each ?><?cs - else ?><?cs - set:leftovers = subcount(classes) - #15 ?><?cs - loop:i = #0, #14, #1 ?><?cs - with:cl=classes[i] ?><?cs - call:type_link(cl.type) ?>,<?cs - /with ?><?cs - if:(#i == #14) ?>and - <a href="#"<?cs - if:enable_javascript ?> - onclick="return toggleInherited(document.getElementById('<?cs var:id ?>', null))"<?cs - /if ?> > - <?cs var:leftovers ?> others.</a><?cs - /if ?><?cs - /loop ?><?cs - /if ?> - </div> - <div id="<?cs var:id ?>-summary"<?cs - if:default != "summary" ?> - style="display: none;"<?cs - /if ?> > - <?cs call:class_link_table(classes) ?> - </div> + <div id="<?cs var:id ?>" class="showalways" > <?cs + if:subcount(classes) <= #20 ?><?cs + each:cl=classes ?><?cs + call:type_link(cl.type) ?><?cs + if:!last(cl) + ?>, <?cs + /if ?><?cs + /each ?><?cs + else ?><?cs + set:leftovers = subcount(classes) - #15 ?><?cs + loop:i = #0, #14, #1 ?><?cs + with:cl=classes[i] ?><?cs + call:type_link(cl.type) ?>, <?cs + /with ?><?cs + if:(#i == #14) ?> and <?cs var:leftovers ?> others.<?cs + /if ?><?cs + /loop ?><?cs + /if ?> + </div> + <div id="<?cs var:id ?>-summary"<?cs + if:default == "summary" ?> + class="showalways"<?cs + /if ?> > + <?cs call:class_link_table(classes) ?> </div><?cs /def ?> |