Camera: update NDK docs am: f850d6ea72
am: 2b57c9ada1
Change-Id: I0c6c9ac846278c0330c80b3f91fddbf5d210e471
diff --git a/camera/docs/metadata_helpers.py b/camera/docs/metadata_helpers.py
index a501524..22d636f 100644
--- a/camera/docs/metadata_helpers.py
+++ b/camera/docs/metadata_helpers.py
@@ -904,6 +904,7 @@
"""
def ndkdoc_formatter(text):
# render with markdown => HTML
+ # Turn off the table plugin since doxygen doesn't recognize generated <thead> <tbody> tags
ndktext = md(text, NDKDOC_IMAGE_SRC_METADATA, False)
# Convert metadata entry "android.x.y.z" to form
diff --git a/camera/docs/ndk_camera_metadata_tags.mako b/camera/docs/ndk_camera_metadata_tags.mako
index 8232e50..f2ba1b0 100644
--- a/camera/docs/ndk_camera_metadata_tags.mako
+++ b/camera/docs/ndk_camera_metadata_tags.mako
@@ -36,13 +36,20 @@
#ifndef _NDK_CAMERA_METADATA_TAGS_H
#define _NDK_CAMERA_METADATA_TAGS_H
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+#if __ANDROID_API__ >= 24
<%!
+ from metadata_helpers import csym
def annotated_type(entry):
type = entry.type
if entry.container == 'array':
type += '[' + '*'.join(entry.container_sizes) + ']'
if entry.enum:
- type += ' (enum)'
+ type += ' (acamera_metadata_enum_%s_t)'%(csym(entry.name).lower())
return type
%>\
@@ -85,9 +92,13 @@
% else:
% if entry.description or entry.details:
/**
+ % if entry.description:
${entry.description | ndkdoc(metadata)}\
+ % endif
*
- * <p>This tag may appear in:</p>
+ * <p>Type: ${annotated_type(entry)}</p>
+ *
+ * <p>This tag may appear in:
* <ul>
% if metadata.is_entry_this_kind(entry, 'static'):
* <li>ACameraMetadata from ACameraManager_getCameraCharacteristics</li>
@@ -98,9 +109,11 @@
% if metadata.is_entry_this_kind(entry, 'controls'):
* <li>ACaptureRequest</li>
% endif
- * </ul>
+ * </ul></p>
*
+ % if entry.details:
${entry.details | ndkdoc(metadata)}\
+ % endif
*/
% endif
${ndk(entry.name) + " = " | csym,ljust(60)}// ${annotated_type(entry)}
@@ -179,7 +192,10 @@
% endfor
% endfor
+#endif /* __ANDROID_API__ >= 24 */
-#endif //_NDK_CAMERA_METADATA_TAGS_H
+__END_DECLS
+
+#endif /* _NDK_CAMERA_METADATA_TAGS_H */
/** @} */