summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-10-24 19:40:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-24 19:40:45 -0700
commitcee5107cf6a2ba53a729e7eedc7c9c91bd27aa1b (patch)
treeb251f46ec1742762133040b0944aa442f0a0529b
parent37fdea969fa9e9685e9d3864055573464ff8cdbb (diff)
parent4e51d8e6d5084a1c9133137e65a36d8e9e0c8cc1 (diff)
downloadbuild-cee5107cf6a2ba53a729e7eedc7c9c91bd27aa1b.zip
build-cee5107cf6a2ba53a729e7eedc7c9c91bd27aa1b.tar.gz
build-cee5107cf6a2ba53a729e7eedc7c9c91bd27aa1b.tar.bz2
am 4e51d8e6: am 4810a244: am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '4e51d8e6d5084a1c9133137e65a36d8e9e0c8cc1': update class header for deprecated info
-rw-r--r--tools/droiddoc/templates-sdk/class.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/droiddoc/templates-sdk/class.cs b/tools/droiddoc/templates-sdk/class.cs
index b85d7f0..b2a4791 100644
--- a/tools/droiddoc/templates-sdk/class.cs
+++ b/tools/droiddoc/templates-sdk/class.cs
@@ -90,7 +90,11 @@ Summary:
<?cs /if ?>
</div><!-- end sum-details-links -->
<div class="api-level">
- <?cs call:since_tags(class) ?>
+ <?cs call:since_tags(class) ?><?cs
+ if:class.deprecatedsince
+ ?><br>Deprecated since <a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html#ApiLevels"
+ >API level <?cs var:class.deprecatedsince ?></a><?cs
+ /if ?>
<?cs call:federated_refs(class) ?>
</div>
</div><!-- end api-info-block -->