From 3a5cb1bd15b39368cb5a703c815eaf0db95ca9ef Mon Sep 17 00:00:00 2001 From: Jeff Arneson Date: Fri, 22 Aug 2014 15:40:47 -0700 Subject: [PATCH] Show annotation information in generated documentation Display the annotations used to override @hide for classes in packages and methods in classes. Bug: 16848303 Change-Id: I5599e6593613edbbe6a002d5d46a0a6561dec55a --- .../templates-sdk/assets/css/default.css | 5 +++ tools/droiddoc/templates-sdk/class.cs | 8 ++++- .../droiddoc/templates-sdk/macros_override.cs | 35 +++++++++++++++++++ tools/droiddoc/templates-sdk/package.cs | 1 + 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 tools/droiddoc/templates-sdk/macros_override.cs diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index 3b647c2049..b3ee207a7b 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -7330,3 +7330,8 @@ a.home-new-cta-btn:hover, line-height: 54px; text-align: center; } + +.annotation-message { + display: block; + font-style: italic; +} \ No newline at end of file diff --git a/tools/droiddoc/templates-sdk/class.cs b/tools/droiddoc/templates-sdk/class.cs index 0461af6292..1a770b3d6a 100644 --- a/tools/droiddoc/templates-sdk/class.cs +++ b/tools/droiddoc/templates-sdk/class.cs @@ -1,5 +1,6 @@ + devsite> Included in documentation by the annotations: ", "") ?> @@ -193,7 +195,10 @@ Summary: () -
+
+ + Included in documentation by the annotations: ", "") ?> +
@@ -546,6 +551,7 @@ From
+ Included in documentation by the annotations: ", "") ?>
diff --git a/tools/droiddoc/templates-sdk/macros_override.cs b/tools/droiddoc/templates-sdk/macros_override.cs new file mode 100644 index 0000000000..6ff8f58d54 --- /dev/null +++ b/tools/droiddoc/templates-sdk/macros_override.cs @@ -0,0 +1,35 @@ + + +Annotations: ", "") ?> + + + + + + + @ + + ,   + + + + + + + + + + + + + + + + + + +
+   + Included in documentation by the annotations: ", "") ?> +
+ \ No newline at end of file diff --git a/tools/droiddoc/templates-sdk/package.cs b/tools/droiddoc/templates-sdk/package.cs index abd49f182b..acb4ee92c0 100644 --- a/tools/droiddoc/templates-sdk/package.cs +++ b/tools/droiddoc/templates-sdk/package.cs @@ -1,5 +1,6 @@ + devsite>