diff options
| author | Scott Main <smain@google.com> | 2013-04-05 15:27:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-05 15:27:08 -0700 |
| commit | 92f56c6130ce2f0358dfde8ea41450c8767402be (patch) | |
| tree | df502a03c278650827f1d740fe52ac9bc427962c | |
| parent | 722ac6ad427cab1d8d6daba6bd100afa9dd94fb7 (diff) | |
| parent | 74c2081b80e20f7851af91aff33aee263a7282f8 (diff) | |
| download | android_external_doclava-92f56c6130ce2f0358dfde8ea41450c8767402be.tar.gz android_external_doclava-92f56c6130ce2f0358dfde8ea41450c8767402be.tar.bz2 android_external_doclava-92f56c6130ce2f0358dfde8ea41450c8767402be.zip | |
am 74c2081b: if there\'s no api level available for deprecated version, provide different message
* commit '74c2081b80e20f7851af91aff33aee263a7282f8':
if there's no api level available for deprecated version, provide different message
| -rw-r--r-- | res/assets/templates/macros.cs | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs index bc6e46d..867abcd 100644 --- a/res/assets/templates/macros.cs +++ b/res/assets/templates/macros.cs @@ -101,23 +101,31 @@ def:tag_list(tags) ?><?cs <?cs # Show the short-form description of something. These come from shortDescr and deprecated ?><?cs def:short_descr(obj) ?><?cs - if:subcount(obj.deprecated) ?> - <em>This <?cs var:obj.kind ?> was deprecated - in API level <?cs var:obj.deprecatedsince ?>. - <?cs call:tag_list(obj.deprecated) ?></em><?cs + if:subcount(obj.deprecated) ?><em><?cs + if:obj.deprecatedsince ?> + This <?cs var:obj.kind ?> was deprecated + in API level <?cs var:obj.deprecatedsince ?>.<?cs + else ?> + This <?cs var:obj.kind ?> is deprecated.<?cs + /if ?> + <?cs call:tag_list(obj.deprecated) ?></em><?cs else ?><?cs call:tag_list(obj.shortDescr) ?><?cs /if ?><?cs /def ?> <?cs # Show the red box with the deprecated warning ?><?cs -def:deprecated_warning(obj) ?><?cs +def:deprecated_warning(obj) ?><?cs if:subcount(obj.deprecated) ?><p> - <p class="caution"> - <strong>This <?cs var:obj.kind ?> was deprecated - in API level <?cs var:obj.deprecatedsince ?></strong>.<br/> <?cs - call:tag_list(obj.deprecated) ?> - </p><?cs - /if ?><?cs + <p class="caution"><strong><?cs + if:obj.deprecatedsince ?> + This <?cs var:obj.kind ?> was deprecated + in API level <?cs var:obj.deprecatedsince ?>.<?cs + else ?> + This <?cs var:obj.kind ?> is deprecated.<?cs + /if ?></strong><br/> + <?cs call:tag_list(obj.deprecated) ?> + </p><?cs + /if ?><?cs /def ?> <?cs # print the See Also: section ?><?cs |