OSDN Git Service

(root) / android-x86 / system-media.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8eb7005)
camera_metadata: Add 'hal_details' field, rename 'notes' field to 'details'
authorEino-Ville Talvala <etalvala@google.com>
Fri, 27 Dec 2013 21:50:19 +0000 (13:50 -0800)
committerEino-Ville Talvala <etalvala@google.com>
Fri, 27 Dec 2013 23:45:04 +0000 (15:45 -0800)
- Details will contain the full documentation aimed at API users
- HAL details will contain additional notes for HAL implementors

Change-Id: I66452914382b8eca166a032bff4681d7fcef22cf

camera/docs/CameraMetadataKeys.mako patch | blob | history
camera/docs/docs.html patch | blob | history
camera/docs/html.mako patch | blob | history
camera/docs/metadata_model.py patch | blob | history
camera/docs/metadata_parser_xml.py patch | blob | history
camera/docs/metadata_properties.xml patch | blob | history
camera/docs/metadata_properties.xsd patch | blob | history
camera/docs/metadata_template.mako patch | blob | history

diff --git a/camera/docs/CameraMetadataKeys.mako b/camera/docs/CameraMetadataKeys.mako
index 815ce39..51b314e 100644 (file)
--- a/camera/docs/CameraMetadataKeys.mako
+++ b/camera/docs/CameraMetadataKeys.mako
@@ -31,8 +31,8 @@
   % if entry.description:
 ${entry.description | javadoc}\
   % endif
-  % if entry.notes:
-${entry.notes | javadoc}\
+  % if entry.details:
+${entry.details | javadoc}\
   % endif
   % if entry.enum and not (entry.typedef and entry.typedef.languages.get('java')):
     % for value in entry.enum.values:
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 0f1cbec..9605fd1 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -704,9 +704,9 @@
 
                 
           <tr class="entry" id="controls_android.colorCorrection.mode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.colorCorrection.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.colorCorrection.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -754,14 +754,16 @@
 should be ignored.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.colorCorrection.transform">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.colorCorrection.transform<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.colorCorrection.transform<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -806,14 +808,16 @@ for precision issues; the final rounded matrix should be
 reported back in this matrix result metadata.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.colorCorrection.gains">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.colorCorrection.gains<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.colorCorrection.gains<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -862,6 +866,8 @@ android.colorCorrection.mode is TRANSFORM_MATRIX.</p>
 the current frame.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -894,9 +900,9 @@ the current frame.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.colorCorrection.transform">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.colorCorrection.transform<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.colorCorrection.transform<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -941,14 +947,16 @@ for precision issues; the final rounded matrix should be
 reported back in this matrix result metadata.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.colorCorrection.gains">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.colorCorrection.gains<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.colorCorrection.gains<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -997,6 +1005,8 @@ android.colorCorrection.mode is TRANSFORM_MATRIX.</p>
 the current frame.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -1034,8 +1044,9 @@ the current frame.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.control.aeAntibandingMode">
-            <td class="entry_name"
-                ><html><body><p>android.control.aeAntibandingMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.aeAntibandingMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1074,14 +1085,16 @@ antibanding<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeExposureCompensation">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.aeExposureCompensation<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.aeExposureCompensation<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -1119,14 +1132,16 @@ exposure compensation of +2 EV; -3 will mean an exposure
 compensation of -1<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeLock">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.aeLock<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.aeLock<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1176,14 +1191,16 @@ fired if the AE mode is ON_AUTO_FLASH / ON_ALWAYS_FLASH /
 ON_AUTO_FLASH_REDEYE.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.aeMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.aeMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1260,14 +1277,16 @@ the flash fields, depending on AE mode) of the request.  The overridden
 values are then provided back to the user in the corresponding result.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeRegions">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.aeRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.aeRegions<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -1319,14 +1338,16 @@ should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeTargetFpsRange">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.aeTargetFpsRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.aeTargetFpsRange<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -1367,14 +1388,16 @@ maintain exposure<wbr></wbr></p></body></html>
 of android.sensor.exposureTime<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aePrecaptureTrigger">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.aePrecaptureTrigger<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.aePrecaptureTrigger<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1428,14 +1451,16 @@ AE mode and state; see the camera HAL device v3 header for
 details.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.afMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.afMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.afMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1554,14 +1579,16 @@ report the current AF status in android.control.afState in
 result metadata.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.afRegions">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.afRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.afRegions<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -1613,14 +1640,16 @@ should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.afTrigger">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.afTrigger<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.afTrigger<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1675,14 +1704,16 @@ header for details. When set to CANCEL, the HAL must cancel
 any active trigger, and return to initial AF state.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.awbLock">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.awbLock<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.awbLock<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1733,14 +1764,16 @@ mode; in other modes, AWB is already fixed to a specific
 setting<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.awbMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.awbMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.awbMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1807,14 +1840,16 @@ is<wbr></wbr></p></body></html>
 <p>Only effective if android.control.mode = AUTO.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.awbRegions">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.awbRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.awbRegions<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -1867,14 +1902,16 @@ should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.captureIntent">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.captureIntent<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.captureIntent<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1947,13 +1984,16 @@ strategy<wbr></wbr></p></body></html>
               <html><body><p>Only used if android.control.mode != OFF.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.effectMode">
-            <td class="entry_name"
-                ><html><body><p>android.control.effectMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.effectMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -2018,14 +2058,16 @@ Only used if android.control.mode != OFF<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.mode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -2095,13 +2137,16 @@ as it wishes. The HAL scene mode 3A settings are provided by
 android.control.sceneModeOverrides.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.sceneMode">
-            <td class="entry_name"
-                ><html><body><p>android.control.sceneMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.sceneMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -2208,14 +2253,16 @@ android.control.mode = SCENE_MODE<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.videoStabilizationMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.videoStabilizationMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.videoStabilizationMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -2260,6 +2307,8 @@ android.scaler.cropRegion to keep the video stream
 stabilized<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -2292,8 +2341,9 @@ stabilized<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.control.aeAvailableAntibandingModes">
-            <td class="entry_name"
-                ><html><body><p>android.control.aeAvailableAntibandingModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.aeAvailableAntibandingModes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2322,13 +2372,16 @@ supported<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.aeAvailableModes">
-            <td class="entry_name"
-                ><html><body><p>android.control.aeAvailableModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.aeAvailableModes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2360,13 +2413,16 @@ supported<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.aeAvailableTargetFpsRanges">
-            <td class="entry_name"
-                ><html><body><p>android.control.aeAvailableTargetFpsRanges<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.aeAvailableTargetFpsRanges<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -2395,13 +2451,16 @@ AE algorithm/hardware<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.aeCompensationRange">
-            <td class="entry_name"
-                ><html><body><p>android.control.aeCompensationRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.aeCompensationRange<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -2435,13 +2494,16 @@ android.control.aeCompensationStepSize<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.aeCompensationStep">
-            <td class="entry_name"
-                ><html><body><p>android.control.aeCompensationStep<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.aeCompensationStep<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
 
@@ -2469,13 +2531,16 @@ can be changed<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.afAvailableModes">
-            <td class="entry_name"
-                ><html><body><p>android.control.afAvailableModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.afAvailableModes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2509,13 +2574,16 @@ selected<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.availableEffects">
-            <td class="entry_name"
-                ><html><body><p>android.control.availableEffects<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.availableEffects<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2548,13 +2616,16 @@ list is supported<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.availableSceneModes">
-            <td class="entry_name"
-                ><html><body><p>android.control.availableSceneModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.availableSceneModes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2588,13 +2659,16 @@ supported.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.availableVideoStabilizationModes">
-            <td class="entry_name"
-                ><html><body><p>android.control.availableVideoStabilizationModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.availableVideoStabilizationModes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2627,13 +2701,16 @@ be supported<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.awbAvailableModes">
-            <td class="entry_name"
-                ><html><body><p>android.control.awbAvailableModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.awbAvailableModes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2664,13 +2741,16 @@ be supported<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.maxRegions">
-            <td class="entry_name"
-                ><html><body><p>android.control.maxRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.control.maxRegions<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -2698,14 +2778,16 @@ regions can be listed for metering?<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.sceneModeOverrides">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.sceneModeOverrides<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.sceneModeOverrides<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2766,6 +2848,8 @@ ON_AUTO_FLASH, AUTO, CONTINUOUS_PICTURE, ON_AUTO_FLASH,
 INCANDESCENT, AUTO }<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -2798,9 +2882,9 @@ INCANDESCENT, AUTO }<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.control.aePrecaptureId">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.aePrecaptureId<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.aePrecaptureId<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -2835,14 +2919,16 @@ by HAL. Always updated even if AE algorithm ignores the
 trigger<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.aeRegions">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.aeRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.aeRegions<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -2894,14 +2980,16 @@ should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.aeState">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.aeState<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.aeState<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -2971,14 +3059,16 @@ MSG_AUTOEXPOSURE notification must be send if a
 notification callback is registered.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.afMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.afMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.afMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3097,14 +3187,16 @@ report the current AF status in android.control.afState in
 result metadata.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.afRegions">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.afRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.afRegions<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -3156,14 +3248,16 @@ should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.afState">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.afState<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.afState<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3240,14 +3334,16 @@ MSG_AUTOFOCUS notification must be send if a notification
 callback is registered.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.afTriggerId">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.afTriggerId<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.afTriggerId<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -3281,14 +3377,16 @@ received yet by HAL. Always updated even if AF algorithm
 ignores the trigger<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.awbMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.awbMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.awbMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3355,14 +3453,16 @@ is<wbr></wbr></p></body></html>
 <p>Only effective if android.control.mode = AUTO.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.awbRegions">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.awbRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.awbRegions<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -3415,14 +3515,16 @@ should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.awbState">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.awbState<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.awbState<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3477,14 +3579,16 @@ MSG_AUTOWHITEBALANCE notification must be send if a
 notification callback is registered.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.mode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.control.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.control.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3554,6 +3658,8 @@ as it wishes. The HAL scene mode 3A settings are provided by
 android.control.sceneModeOverrides.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -3591,8 +3697,9 @@ android.control.sceneModeOverrides.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.demosaic.mode">
-            <td class="entry_name"
-                ><html><body><p>android.demosaic.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.demosaic.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3631,6 +3738,8 @@ processing<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -3668,9 +3777,9 @@ processing<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.edge.mode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.edge.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.edge.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3724,13 +3833,16 @@ even if it slows down capture rate. FAST means the HAL should
 not slow down capture rate when applying edge enhancement.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.edge.strength">
-            <td class="entry_name"
-                ><html><body><p>android.edge.strength<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.edge.strength<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -3755,6 +3867,8 @@ applied to the images<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -3787,9 +3901,9 @@ applied to the images<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.edge.mode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.edge.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.edge.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3843,6 +3957,8 @@ even if it slows down capture rate. FAST means the HAL should
 not slow down capture rate when applying edge enhancement.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -3880,9 +3996,9 @@ not slow down capture rate when applying edge enhancement.<wbr></wbr></p></body>
 
                 
           <tr class="entry" id="controls_android.flash.firingPower">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.flash.firingPower<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.flash.firingPower<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -3920,14 +4036,16 @@ for torch mode. Only one entry for torch mode will be
 used<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.flash.firingTime">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.flash.firingTime<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.flash.firingTime<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -3965,13 +4083,16 @@ exposure<wbr></wbr></p></body></html>
 duration).<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.flash.mode">
-            <td class="entry_name"
-                ><html><body><p>android.flash.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.flash.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4016,6 +4137,8 @@ duration).<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -4050,9 +4173,9 @@ duration).<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.flash.info.available">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.flash.info.available<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.flash.info.available<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4089,14 +4212,16 @@ flash<wbr></wbr></p></body></html>
 anything. All other metadata should return 0<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.flash.info.chargeDuration">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.flash.info.chargeDuration<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.flash.info.chargeDuration<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -4134,6 +4259,8 @@ again<wbr></wbr></p></body></html>
 this be power-dependent?<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -4142,8 +4269,9 @@ this be power-dependent?<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.flash.colorTemperature">
-            <td class="entry_name"
-                ><html><body><p>android.flash.colorTemperature<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.flash.colorTemperature<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4172,13 +4300,16 @@ flash<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.flash.maxEnergy">
-            <td class="entry_name"
-                ><html><body><p>android.flash.maxEnergy<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.flash.maxEnergy<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4207,6 +4338,8 @@ power single flash<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -4239,9 +4372,9 @@ power single flash<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.flash.firingPower">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.flash.firingPower<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.flash.firingPower<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4279,14 +4412,16 @@ for torch mode. Only one entry for torch mode will be
 used<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.flash.firingTime">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.flash.firingTime<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.flash.firingTime<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -4324,13 +4459,16 @@ exposure<wbr></wbr></p></body></html>
 duration).<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.flash.mode">
-            <td class="entry_name"
-                ><html><body><p>android.flash.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.flash.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4375,13 +4513,16 @@ duration).<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.flash.state">
-            <td class="entry_name"
-                ><html><body><p>android.flash.state<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.flash.state<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4426,6 +4567,8 @@ unit<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -4463,8 +4606,9 @@ unit<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.geometric.mode">
-            <td class="entry_name"
-                ><html><body><p>android.geometric.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.geometric.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4505,13 +4649,16 @@ correction<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.geometric.strength">
-            <td class="entry_name"
-                ><html><body><p>android.geometric.strength<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.geometric.strength<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4540,6 +4687,8 @@ applied to the images<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -4577,8 +4726,9 @@ applied to the images<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.hotPixel.mode">
-            <td class="entry_name"
-                ><html><body><p>android.hotPixel.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.hotPixel.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4622,6 +4772,8 @@ correction<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -4656,8 +4808,9 @@ correction<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.hotPixel.info.map">
-            <td class="entry_name"
-                ><html><body><p>android.hotPixel.info.map<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.hotPixel.info.map<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -4689,6 +4842,8 @@ sensor<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -4724,8 +4879,9 @@ sensor<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.hotPixel.mode">
-            <td class="entry_name"
-                ><html><body><p>android.hotPixel.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.hotPixel.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4769,6 +4925,8 @@ correction<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -4806,8 +4964,9 @@ correction<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.jpeg.gpsCoordinates">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.gpsCoordinates<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.gpsCoordinates<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">double</span>
                 <span class="entry_type_container">x</span>
@@ -4840,13 +4999,16 @@ EXIF<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.gpsProcessingMethod">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.gpsProcessingMethod<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.gpsProcessingMethod<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4874,13 +5036,16 @@ include in EXIF<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.gpsTimestamp">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.gpsTimestamp<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.gpsTimestamp<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -4908,13 +5073,16 @@ EXIF<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.orientation">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.orientation<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.orientation<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -4943,14 +5111,16 @@ write<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.quality">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.jpeg.quality<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.jpeg.quality<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4986,13 +5156,16 @@ image<wbr></wbr></p></body></html>
               <html><body><p>85-95 is typical usage range<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.thumbnailQuality">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.thumbnailQuality<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.thumbnailQuality<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -5020,13 +5193,16 @@ thumbnail<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.thumbnailSize">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.thumbnailSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.jpeg.thumbnailSize<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -5040,15 +5216,14 @@ thumbnail<wbr></wbr></p></body></html>
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <html><body><p>Resolution of embedded JPEG
-thumbnail<wbr></wbr></p></body></html>
+              <html><body><p>Resolution of embedded JPEG thumbnail<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_units">
             </td>
 
             <td class="entry_range">
-              <html><body><p>from android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html>
+              <html><body><p>Size must be one of the size from android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_tags">
@@ -5058,6 +5233,19 @@ thumbnail<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>When set to (0, 0) value, the JPEG EXIF must not contain thumbnail,
+but the captured JPEG must still be a valid image.</p>
+<p>When a jpeg image capture is issued, the thumbnail size selected should have
+the same aspect ratio as the jpeg image.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -5090,8 +5278,9 @@ thumbnail<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.jpeg.availableThumbnailSizes">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -5100,14 +5289,12 @@ thumbnail<wbr></wbr></p></body></html>
                   2 x n
                 </span>
               <span class="entry_type_visibility"> [public as size]</span>
-                <div class="entry_type_notes"><html><body><p>list of resolution pairs<wbr></wbr></p></body></html></div>
 
 
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <html><body><p>Supported resolutions for the JPEG
-thumbnail<wbr></wbr></p></body></html>
+              <html><body><p>Supported resolutions for the JPEG thumbnail<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_units">
@@ -5115,7 +5302,7 @@ thumbnail<wbr></wbr></p></body></html>
 
             <td class="entry_range">
               <html><body><p>Must include at least one valid resolution, plus
-          (0,0) for no thumbnail generation<wbr></wbr></p></body></html>
+          (0,0) for no thumbnail generation, and each size must be distinct.<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_tags">
@@ -5125,14 +5312,36 @@ thumbnail<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Below condiditions must be satisfied for this size list:</p>
+<ul>
+<li>The sizes must be sorted by increasing pixel area (width x height).
+If several resolutions have the same area, they must be sorted by increasing width.</li>
+<li>The aspect ratio of the largest thumbnail size must be same as the
+aspect ratio of largest size in android.scaler.availableJpegSizes.
+The largest size is defined as the size that has the largest pixel area
+in a given size list.</li>
+<li>Each size in android.scaler.availableJpegSizes must have at least
+one corresponding size that has the same aspect ratio in availableThumbnailSizes,
+and vice versa.</li>
+<li>All non (0, 0) sizes must have non-zero widths and heights.</li>
+<wbr></wbr></ul></body></html>
+            </td>
+          </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.jpeg.maxSize">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.jpeg.maxSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.jpeg.maxSize<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -5167,6 +5376,8 @@ JPEG buffer<wbr></wbr></p></body></html>
 JPEG<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -5199,8 +5410,9 @@ JPEG<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.jpeg.gpsCoordinates">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.gpsCoordinates<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.gpsCoordinates<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">double</span>
                 <span class="entry_type_container">x</span>
@@ -5233,13 +5445,16 @@ EXIF<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.gpsProcessingMethod">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.gpsProcessingMethod<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.gpsProcessingMethod<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -5267,13 +5482,16 @@ include in EXIF<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.gpsTimestamp">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.gpsTimestamp<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.gpsTimestamp<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -5301,13 +5519,16 @@ EXIF<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.orientation">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.orientation<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.orientation<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -5336,14 +5557,16 @@ write<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.quality">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.jpeg.quality<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.jpeg.quality<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -5379,14 +5602,16 @@ image<wbr></wbr></p></body></html>
               <html><body><p>85-95 is typical usage range<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.size">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.jpeg.size<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.jpeg.size<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -5426,13 +5651,16 @@ the JPEG stream will be 1000000 bytes, of which the first
 500000 make up the real data.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.thumbnailQuality">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.thumbnailQuality<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.jpeg.thumbnailQuality<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -5460,13 +5688,16 @@ thumbnail<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.thumbnailSize">
-            <td class="entry_name"
-                ><html><body><p>android.jpeg.thumbnailSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.jpeg.thumbnailSize<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -5480,15 +5711,14 @@ thumbnail<wbr></wbr></p></body></html>
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <html><body><p>Resolution of embedded JPEG
-thumbnail<wbr></wbr></p></body></html>
+              <html><body><p>Resolution of embedded JPEG thumbnail<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_units">
             </td>
 
             <td class="entry_range">
-              <html><body><p>from android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html>
+              <html><body><p>Size must be one of the size from android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_tags">
@@ -5498,6 +5728,19 @@ thumbnail<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>When set to (0, 0) value, the JPEG EXIF must not contain thumbnail,
+but the captured JPEG must still be a valid image.</p>
+<p>When a jpeg image capture is issued, the thumbnail size selected should have
+the same aspect ratio as the jpeg image.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -5535,9 +5778,9 @@ thumbnail<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.lens.aperture">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.aperture<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.aperture<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5574,14 +5817,16 @@ thumbnail<wbr></wbr></p></body></html>
 pick from supported list<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.lens.filterDensity">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.filterDensity<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.filterDensity<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5619,14 +5864,16 @@ filter(s)<wbr></wbr></p></body></html>
 pick from supported list<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.lens.focalLength">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.focalLength<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.focalLength<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5662,14 +5909,16 @@ pick from supported list<wbr></wbr></p></body></html>
               <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.lens.focusDistance">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.focusDistance<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.focusDistance<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5708,14 +5957,16 @@ measured from frontmost surface of the lens<wbr></wbr></p></body></html>
 to (0,minimum focus distance)<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.lens.opticalStabilizationMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.opticalStabilizationMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.opticalStabilizationMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -5760,6 +6011,8 @@ enabled.<wbr></wbr></p></body></html>
               <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -5794,9 +6047,9 @@ enabled.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.lens.info.availableApertures">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.info.availableApertures<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.info.availableApertures<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -5837,14 +6090,16 @@ values<wbr></wbr></p></body></html>
 should be for the fixed aperture<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.availableFilterDensities">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.info.availableFilterDensities<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.info.availableFilterDensities<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -5887,14 +6142,16 @@ lists the available exposure index values for dimming
 light by two stops)<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.availableFocalLengths">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.info.availableFocalLengths<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.info.availableFocalLengths<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -5938,13 +6195,16 @@ length<wbr></wbr></p></body></html>
 should be reported<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.availableOpticalStabilization">
-            <td class="entry_name"
-                ><html><body><p>android.lens.info.availableOpticalStabilization<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.lens.info.availableOpticalStabilization<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -5976,14 +6236,16 @@ stabilization modes<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.geometricCorrectionMap">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.info.geometricCorrectionMap<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.info.geometricCorrectionMap<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -6029,13 +6291,16 @@ j/(N-1) * height). Data is row-major, with each array
 entry being ( (X, Y)_r, (X, Y)_g, (X, Y)_b ) )<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.geometricCorrectionMapSize">
-            <td class="entry_name"
-                ><html><body><p>android.lens.info.geometricCorrectionMapSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.lens.info.geometricCorrectionMapSize<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -6068,14 +6333,16 @@ map<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.hyperfocalDistance">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.info.hyperfocalDistance<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.info.hyperfocalDistance<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -6113,14 +6380,16 @@ map<wbr></wbr></p></body></html>
 API's 'fixed' setting<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.minimumFocusDistance">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.info.minimumFocusDistance<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.info.minimumFocusDistance<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -6158,14 +6427,16 @@ of the lens that can be focused correctly<wbr></wbr></p></body></html>
 0<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.shadingMapSize">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.info.shadingMapSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.info.shadingMapSize<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -6206,6 +6477,8 @@ of the lens that can be focused correctly<wbr></wbr></p></body></html>
 must be smaller than 64x64.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -6214,8 +6487,9 @@ must be smaller than 64x64.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.lens.facing">
-            <td class="entry_name"
-                ><html><body><p>android.lens.facing<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.lens.facing<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6247,14 +6521,16 @@ device screen<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.opticalAxisAngle">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.opticalAxisAngle<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.opticalAxisAngle<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -6303,13 +6579,16 @@ the device is held upright.</p>
 direction<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.position">
-            <td class="entry_name"
-                ><html><body><p>android.lens.position<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.lens.position<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -6341,6 +6620,8 @@ device<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -6373,9 +6654,9 @@ device<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.lens.aperture">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.aperture<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.aperture<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -6412,14 +6693,16 @@ device<wbr></wbr></p></body></html>
 pick from supported list<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.filterDensity">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.filterDensity<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.filterDensity<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -6457,14 +6740,16 @@ filter(s)<wbr></wbr></p></body></html>
 pick from supported list<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.focalLength">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.focalLength<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.focalLength<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -6500,14 +6785,16 @@ pick from supported list<wbr></wbr></p></body></html>
               <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.focusDistance">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.focusDistance<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.focusDistance<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -6544,14 +6831,16 @@ measured from frontmost surface of the lens<wbr></wbr></p></body></html>
               <html><body><p>Should be zero for fixed-focus cameras<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.focusRange">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.focusRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.focusRange<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -6595,14 +6884,16 @@ sharp focus (depth of field)<wbr></wbr></p></body></html>
 fixed depth of field range<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.opticalStabilizationMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.lens.opticalStabilizationMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.lens.opticalStabilizationMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6647,13 +6938,16 @@ enabled.<wbr></wbr></p></body></html>
               <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.state">
-            <td class="entry_name"
-                ><html><body><p>android.lens.state<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.lens.state<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6687,6 +6981,8 @@ enabled.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -6724,9 +7020,9 @@ enabled.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.noiseReduction.mode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.noiseReduction.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.noiseReduction.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6784,13 +7080,16 @@ even if it slows down capture rate. FAST means the HAL should not
 slow down capture rate when applying noise filtering.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.noiseReduction.strength">
-            <td class="entry_name"
-                ><html><body><p>android.noiseReduction.strength<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.noiseReduction.strength<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -6816,6 +7115,8 @@ applied to the images<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -6848,9 +7149,9 @@ applied to the images<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.noiseReduction.mode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.noiseReduction.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.noiseReduction.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6908,6 +7209,8 @@ even if it slows down capture rate. FAST means the HAL should not
 slow down capture rate when applying noise filtering.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -6945,9 +7248,9 @@ slow down capture rate when applying noise filtering.<wbr></wbr></p></body></htm
 
                 
           <tr class="entry" id="static_android.quirks.meteringCropRegion">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.quirks.meteringCropRegion<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.quirks.meteringCropRegion<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -6987,14 +7290,16 @@ not need to be listed in static metadata. Support will be
 removed in future versions of camera service.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.quirks.triggerAfWithAuto">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.quirks.triggerAfWithAuto<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.quirks.triggerAfWithAuto<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -7031,14 +7336,16 @@ not need to be listed in static metadata. Support will be
 removed in future versions of camera service<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.quirks.useZslFormat">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.quirks.useZslFormat<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.quirks.useZslFormat<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -7077,14 +7384,16 @@ metadata. Support will be removed in future versions of
 camera service.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.quirks.usePartialResult">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.quirks.usePartialResult<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.quirks.usePartialResult<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -7121,6 +7430,8 @@ working at that point; DO NOT USE without careful
 consideration of future support.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -7153,9 +7464,9 @@ consideration of future support.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.quirks.partialResult">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.quirks.partialResult<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.quirks.partialResult<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -7212,6 +7523,8 @@ capture must arrive before the FINAL buffer for that capture. This entry may
 only be used by the HAL if quirks.usePartialResult is set to 1.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -7249,8 +7562,9 @@ only be used by the HAL if quirks.usePartialResult is set to 1.<wbr></wbr></p></
 
                 
           <tr class="entry" id="controls_android.request.frameCount">
-            <td class="entry_name"
-                ><html><body><p>android.request.frameCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.request.frameCount<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -7278,13 +7592,16 @@ frameCount value).<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.id">
-            <td class="entry_name"
-                ><html><body><p>android.request.id<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.request.id<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -7314,14 +7631,16 @@ frame<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.inputStreams">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.request.inputStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.request.inputStreams<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7368,13 +7687,16 @@ for the source of reprocessing data.<wbr></wbr></p></body></html>
 REPROCESS. Ignored otherwise<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.metadataMode">
-            <td class="entry_name"
-                ><html><body><p>android.request.metadataMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.request.metadataMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -7417,14 +7739,16 @@ output<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.outputStreams">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.request.outputStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.request.outputStreams<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7469,13 +7793,16 @@ still be captured for metadata and statistics production,
 and the lens and flash must operate as requested.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.type">
-            <td class="entry_name"
-                ><html><body><p>android.request.type<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.request.type<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -7517,6 +7844,8 @@ REPROCESS. For HAL3, this tag is redundant.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -7549,9 +7878,9 @@ REPROCESS. For HAL3, this tag is redundant.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.request.maxNumOutputStreams">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.request.maxNumOutputStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.request.maxNumOutputStreams<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7597,13 +7926,16 @@ processed streams (preview, record, app callbacks) and
 one JPEG stream (snapshot)<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.request.maxNumReprocessStreams">
-            <td class="entry_name"
-                ><html><body><p>android.request.maxNumReprocessStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.request.maxNumReprocessStreams<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7631,7 +7963,9 @@ can be allocated at the same time<wbr></wbr></p></body></html>
             <td class="entry_tags">
             </td>
 
-          </tr>
+          </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -7664,9 +7998,9 @@ can be allocated at the same time<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.request.frameCount">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.request.frameCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.request.frameCount<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -7701,13 +8035,16 @@ frameCount value).<wbr></wbr></p></body></html>
               <html><body><p>Reset on release()<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.request.id">
-            <td class="entry_name"
-                ><html><body><p>android.request.id<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.request.id<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -7737,13 +8074,16 @@ frame<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.request.metadataMode">
-            <td class="entry_name"
-                ><html><body><p>android.request.metadataMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.request.metadataMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -7786,14 +8126,16 @@ output<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.request.outputStreams">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.request.outputStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.request.outputStreams<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7838,6 +8180,8 @@ still be captured for metadata and statistics production,
 and the lens and flash must operate as requested.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -7875,9 +8219,9 @@ and the lens and flash must operate as requested.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.scaler.cropRegion">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.scaler.cropRegion<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.scaler.cropRegion<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7945,6 +8289,8 @@ activeArraySize.height / android.scaler.maxDigitalZoom),
 respectively.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -7977,8 +8323,9 @@ respectively.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.scaler.availableFormats">
-            <td class="entry_name"
-                ><html><body><p>android.scaler.availableFormats<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.scaler.availableFormats<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8040,14 +8387,16 @@ respectively.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableJpegMinDurations">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.scaler.availableJpegMinDurations<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.scaler.availableJpegMinDurations<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
                 <span class="entry_type_container">x</span>
@@ -8091,13 +8440,16 @@ frame duration will be &gt;= max(individual stream min
 durations)<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableJpegSizes">
-            <td class="entry_name"
-                ><html><body><p>android.scaler.availableJpegSizes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.scaler.availableJpegSizes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8130,13 +8482,16 @@ the JPEG block. Listed as width x height<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableMaxDigitalZoom">
-            <td class="entry_name"
-                ><html><body><p>android.scaler.availableMaxDigitalZoom<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.scaler.availableMaxDigitalZoom<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -8166,14 +8521,16 @@ than width<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableProcessedMinDurations">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.scaler.availableProcessedMinDurations<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.scaler.availableProcessedMinDurations<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
                 <span class="entry_type_container">x</span>
@@ -8217,14 +8574,16 @@ frame duration will be &gt;= max(individual stream min
 durations)<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableProcessedSizes">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.scaler.availableProcessedSizes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.scaler.availableProcessedSizes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8273,14 +8632,16 @@ case, the largest supported resolution may be limited by max
 resolution SurfaceTexture/SurfaceView can support.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableRawMinDurations">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.scaler.availableRawMinDurations<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.scaler.availableRawMinDurations<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
                 <span class="entry_type_container">x</span>
@@ -8323,13 +8684,16 @@ frame duration will be &gt;= max(individual stream min
 durations)<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableRawSizes">
-            <td class="entry_name"
-                ><html><body><p>android.scaler.availableRawSizes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.scaler.availableRawSizes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8359,6 +8723,8 @@ height<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -8391,9 +8757,9 @@ height<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.scaler.cropRegion">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.scaler.cropRegion<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.scaler.cropRegion<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8461,6 +8827,8 @@ activeArraySize.height / android.scaler.maxDigitalZoom),
 respectively.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -8498,9 +8866,9 @@ respectively.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.sensor.exposureTime">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.exposureTime<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.exposureTime<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -8539,14 +8907,16 @@ duration exposed to the nearest possible value (rather than expose longer).<wbr>
               <html><body><p>1/10000 - 30 sec range. No bulb mode<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.sensor.frameDuration">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.frameDuration<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.frameDuration<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -8586,14 +8956,16 @@ start of next frame exposure<wbr></wbr></p></body></html>
 max(duration, exposure time + overhead)<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.sensor.sensitivity">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.sensitivity<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.sensitivity<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -8633,6 +9005,8 @@ gain to the nearest possible value (rather than gain more).<wbr></wbr></p></body
               <html><body><p>ISO 12232:2006 REI method<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -8667,8 +9041,9 @@ gain to the nearest possible value (rather than gain more).<wbr></wbr></p></body
 
                 
           <tr class="entry" id="static_android.sensor.info.activeArraySize">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.info.activeArraySize<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.info.activeArraySize<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8703,13 +9078,16 @@ pixelArraySize.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.sensitivityRange">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.info.sensitivityRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.info.sensitivityRange<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8742,13 +9120,16 @@ pixelArraySize.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.colorFilterArrangement">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.info.colorFilterArrangement<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.info.colorFilterArrangement<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -8796,13 +9177,16 @@ the sensor, in reading order<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.exposureTimeRange">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.info.exposureTimeRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.info.exposureTimeRange<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
                 <span class="entry_type_container">x</span>
@@ -8836,14 +9220,16 @@ times<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.maxFrameDuration">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.info.maxFrameDuration<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.info.maxFrameDuration<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -8885,14 +9271,16 @@ android.scaler.availableJpegMinDurations
 android.scaler.availableRawMinDurations<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.physicalSize">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.info.physicalSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.info.physicalSize<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -8933,14 +9321,16 @@ array<wbr></wbr></p></body></html>
               <html><body><p>Needed for FOV calculation for old API<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.pixelArraySize">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.info.pixelArraySize<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.info.pixelArraySize<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8982,14 +9372,16 @@ match this in
 android.scaler.info.availableSizesPerFormat<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.whiteLevel">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.info.whiteLevel<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.info.whiteLevel<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -9026,6 +9418,8 @@ sensor<wbr></wbr></p></body></html>
 expected)<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -9034,8 +9428,9 @@ expected)<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.sensor.baseGainFactor">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.baseGainFactor<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.baseGainFactor<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
 
@@ -9063,14 +9458,16 @@ ISO=100<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.blackLevelPattern">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.blackLevelPattern<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.blackLevelPattern<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -9112,13 +9509,16 @@ Bayer mosaic channels<wbr></wbr></p></body></html>
 tags<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.calibrationTransform1">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.calibrationTransform1<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.calibrationTransform1<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -9150,13 +9550,16 @@ transform 1<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.calibrationTransform2">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.calibrationTransform2<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.calibrationTransform2<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -9188,14 +9591,16 @@ transform 2<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.colorTransform1">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.colorTransform1<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.colorTransform1<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -9238,13 +9643,16 @@ black level(raw) ) / ( white level - max black level) ).
 At least in the simple case<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.colorTransform2">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.colorTransform2<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.colorTransform2<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -9277,13 +9685,16 @@ illuminant<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.forwardMatrix1">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.forwardMatrix1<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.forwardMatrix1<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -9315,13 +9726,16 @@ adaptation<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.forwardMatrix2">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.forwardMatrix2<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.forwardMatrix2<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -9353,14 +9767,16 @@ adaptation<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.maxAnalogSensitivity">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.maxAnalogSensitivity<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.maxAnalogSensitivity<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -9399,14 +9815,16 @@ values above this, it can be a mix of analog and
 digital<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.noiseModelCoefficients">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.noiseModelCoefficients<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.noiseModelCoefficients<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -9453,13 +9871,16 @@ are assumed to be gaussian, independent, and not to vary
 across the sensor<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.orientation">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.orientation<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.orientation<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -9492,14 +9913,16 @@ to bottom in the sensor's coordinate system<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.referenceIlluminant1">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.referenceIlluminant1<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.referenceIlluminant1<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -9619,13 +10042,16 @@ to bottom in the sensor's coordinate system<wbr></wbr></p></body></html>
 supported? Need CCT for each!<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.referenceIlluminant2">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.referenceIlluminant2<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.referenceIlluminant2<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -9650,6 +10076,8 @@ supported? Need CCT for each!<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -9682,9 +10110,9 @@ supported? Need CCT for each!<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.sensor.exposureTime">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.exposureTime<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.exposureTime<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -9723,14 +10151,16 @@ duration exposed to the nearest possible value (rather than expose longer).<wbr>
               <html><body><p>1/10000 - 30 sec range. No bulb mode<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.sensor.frameDuration">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.frameDuration<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.frameDuration<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -9770,14 +10200,16 @@ start of next frame exposure<wbr></wbr></p></body></html>
 max(duration, exposure time + overhead)<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.sensor.sensitivity">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.sensitivity<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.sensitivity<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -9817,14 +10249,16 @@ gain to the nearest possible value (rather than gain more).<wbr></wbr></p></body
               <html><body><p>ISO 12232:2006 REI method<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.sensor.timestamp">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.sensor.timestamp<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.sensor.timestamp<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -9862,13 +10296,16 @@ row<wbr></wbr></p></body></html>
 system<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.sensor.temperature">
-            <td class="entry_name"
-                ><html><body><p>android.sensor.temperature<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.sensor.temperature<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -9899,6 +10336,8 @@ somewhere close to it.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -9936,8 +10375,9 @@ somewhere close to it.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.shading.mode">
-            <td class="entry_name"
-                ><html><body><p>android.shading.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.shading.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -9977,13 +10417,16 @@ to the image data<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.shading.strength">
-            <td class="entry_name"
-                ><html><body><p>android.shading.strength<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.shading.strength<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -10012,6 +10455,8 @@ applied to the images<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -10044,8 +10489,9 @@ applied to the images<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.shading.mode">
-            <td class="entry_name"
-                ><html><body><p>android.shading.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.shading.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10085,6 +10531,8 @@ to the image data<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -10122,9 +10570,9 @@ to the image data<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.statistics.faceDetectMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.faceDetectMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.faceDetectMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10178,13 +10626,16 @@ fields. Value must be one of the
 android.statistics.info.availableFaceDetectModes.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.statistics.histogramMode">
-            <td class="entry_name"
-                ><html><body><p>android.statistics.histogramMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.statistics.histogramMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10219,13 +10670,16 @@ generation<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.statistics.sharpnessMapMode">
-            <td class="entry_name"
-                ><html><body><p>android.statistics.sharpnessMapMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.statistics.sharpnessMapMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10260,14 +10714,16 @@ generation<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.statistics.lensShadingMapMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.lensShadingMapMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.lensShadingMapMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10309,6 +10765,8 @@ android.statistics.lensShadingMap must be provided in
 the output result metadata.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -10343,9 +10801,9 @@ the output result metadata.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.statistics.info.availableFaceDetectModes">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.info.availableFaceDetectModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.info.availableFaceDetectModes<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -10393,13 +10851,16 @@ android.statistics.faceIds and
 android.statistics.faceLandmarks outputs.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.histogramBucketCount">
-            <td class="entry_name"
-                ><html><body><p>android.statistics.info.histogramBucketCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.statistics.info.histogramBucketCount<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -10424,13 +10885,16 @@ supported<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.maxFaceCount">
-            <td class="entry_name"
-                ><html><body><p>android.statistics.info.maxFaceCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.statistics.info.maxFaceCount<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -10456,13 +10920,16 @@ faces<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.maxHistogramCount">
-            <td class="entry_name"
-                ><html><body><p>android.statistics.info.maxHistogramCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.statistics.info.maxHistogramCount<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -10486,13 +10953,16 @@ bucket<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.maxSharpnessMapValue">
-            <td class="entry_name"
-                ><html><body><p>android.statistics.info.maxSharpnessMapValue<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.statistics.info.maxSharpnessMapValue<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -10516,13 +10986,16 @@ region.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.sharpnessMapSize">
-            <td class="entry_name"
-                ><html><body><p>android.statistics.info.sharpnessMapSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.statistics.info.sharpnessMapSize<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -10552,6 +11025,8 @@ map<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -10587,9 +11062,9 @@ map<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.statistics.faceDetectMode">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.faceDetectMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.faceDetectMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10643,14 +11118,16 @@ fields. Value must be one of the
 android.statistics.info.availableFaceDetectModes.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.faceIds">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.faceIds<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.faceIds<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -10689,14 +11166,16 @@ faces<wbr></wbr></p></body></html>
               <html><body><p>Only available if faceDetectMode == FULL<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.faceLandmarks">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.faceLandmarks<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.faceLandmarks<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -10736,14 +11215,16 @@ faces<wbr></wbr></p></body></html>
               <html><body><p>Only available if faceDetectMode == FULL<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.faceRectangles">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.faceRectangles<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.faceRectangles<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -10783,14 +11264,16 @@ faces<wbr></wbr></p></body></html>
               <html><body><p>Only available if faceDetectMode != OFF<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.faceScores">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.faceScores<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.faceScores<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -10831,14 +11314,16 @@ detected faces<wbr></wbr></p></body></html>
 meaningful (for example, setting 100 at all times is illegal).<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.histogram">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.histogram<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.histogram<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -10881,13 +11366,16 @@ sensor data<wbr></wbr></p></body></html>
 supported, all channels should have the same data<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.histogramMode">
-            <td class="entry_name"
-                ><html><body><p>android.statistics.histogramMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.statistics.histogramMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10922,14 +11410,16 @@ generation<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.sharpnessMap">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.sharpnessMap<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.sharpnessMap<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -10970,13 +11460,16 @@ sensor data<wbr></wbr></p></body></html>
 all channels should have the same data<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.sharpnessMapMode">
-            <td class="entry_name"
-                ><html><body><p>android.statistics.sharpnessMapMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.statistics.sharpnessMapMode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11011,14 +11504,16 @@ generation<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.lensShadingMap">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.lensShadingMap<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.lensShadingMap<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -11093,14 +11588,16 @@ image of a gray wall (using bicubic interpolation for visual quality) as capture
 <wbr></wbr><p><img alt="Image of a uniform white wall (inverse shading map)" src="images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png"/></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.predictedColorGains">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.predictedColorGains<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.predictedColorGains<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -11144,14 +11641,16 @@ see android.colorCorrection.gains for details.</p>
 regardless of the android.control.* current values.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.predictedColorTransform">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.predictedColorTransform<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.predictedColorTransform<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -11200,14 +11699,16 @@ capture settings and color transforms are set by the application.</p>
 regardless of the android.control.* current values.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.sceneFlicker">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.statistics.sceneFlicker<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.statistics.sceneFlicker<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11251,6 +11752,8 @@ frequency<wbr></wbr></p></body></html>
 illumination<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -11288,9 +11791,9 @@ illumination<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="controls_android.tonemap.curveBlue">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.tonemap.curveBlue<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.tonemap.curveBlue<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -11331,14 +11834,16 @@ channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>See android.tonemap.curveRed for more details.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.tonemap.curveGreen">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.tonemap.curveGreen<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.tonemap.curveGreen<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -11379,14 +11884,16 @@ channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>See android.tonemap.curveRed for more details.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.tonemap.curveRed">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.tonemap.curveRed<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.tonemap.curveRed<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -11438,13 +11945,16 @@ for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
 0.25, 0.3 -&gt; 0.5, 0.5 -&gt; 0.64<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.tonemap.mode">
-            <td class="entry_name"
-                ><html><body><p>android.tonemap.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.tonemap.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11483,6 +11993,8 @@ for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -11515,8 +12027,9 @@ for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
 
                 
           <tr class="entry" id="static_android.tonemap.maxCurvePoints">
-            <td class="entry_name"
-                ><html><body><p>android.tonemap.maxCurvePoints<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.tonemap.maxCurvePoints<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -11541,6 +12054,8 @@ tonemap curve<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -11573,9 +12088,9 @@ tonemap curve<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.tonemap.curveBlue">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.tonemap.curveBlue<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.tonemap.curveBlue<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -11616,14 +12131,16 @@ channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>See android.tonemap.curveRed for more details.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.tonemap.curveGreen">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.tonemap.curveGreen<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.tonemap.curveGreen<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -11664,14 +12181,16 @@ channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>See android.tonemap.curveRed for more details.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.tonemap.curveRed">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.tonemap.curveRed<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.tonemap.curveRed<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -11723,13 +12242,16 @@ for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
 0.25, 0.3 -&gt; 0.5, 0.5 -&gt; 0.64<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.tonemap.mode">
-            <td class="entry_name"
-                ><html><body><p>android.tonemap.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.tonemap.mode<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11768,6 +12290,8 @@ for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -11805,8 +12329,9 @@ for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
 
                 
           <tr class="entry" id="controls_android.led.transmit">
-            <td class="entry_name"
-                ><html><body><p>android.led.transmit<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.led.transmit<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11846,6 +12371,8 @@ doesn't violate the above rules.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -11878,8 +12405,9 @@ doesn't violate the above rules.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.led.transmit">
-            <td class="entry_name"
-                ><html><body><p>android.led.transmit<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.led.transmit<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11919,6 +12447,8 @@ doesn't violate the above rules.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -11951,8 +12481,9 @@ doesn't violate the above rules.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.led.availableLeds">
-            <td class="entry_name"
-                ><html><body><p>android.led.availableLeds<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.led.availableLeds<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
                 <span class="entry_type_container">x</span>
@@ -11985,6 +12516,8 @@ doesn't violate the above rules.<wbr></wbr></p></body></html>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -12022,8 +12555,9 @@ doesn't violate the above rules.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="static_android.info.supportedHardwareLevel">
-            <td class="entry_name"
-                ><html><body><p>android.info.supportedHardwareLevel<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="1">
+              <html><body><p>android.info.supportedHardwareLevel<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -12062,6 +12596,8 @@ limited, and they share the same essential operational flow.</p>
             </td>
 
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -12099,9 +12635,9 @@ limited, and they share the same essential operational flow.</p>
 
                 
           <tr class="entry" id="controls_android.blackLevel.lock">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.blackLevel.lock<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.blackLevel.lock<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -12179,6 +12715,8 @@ must report 'OFF' when this does happen) until the next time locking
 is legal again.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
@@ -12211,9 +12749,9 @@ is legal again.<wbr></wbr></p></body></html>
 
                 
           <tr class="entry" id="dynamic_android.blackLevel.lock">
-            <td class="entry_name"
-                  rowspan="3"
-                ><html><body><p>android.blackLevel.lock<wbr></wbr></p></body></html></td>
+            <td class="entry_name" rowspan="3">
+              <html><body><p>android.blackLevel.lock<wbr></wbr></p></body></html>
+            </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -12258,6 +12796,8 @@ Should be ON if android.blackLevel.lock was ON in the capture request,
 unless a change in capture settings forced a black level reset.<wbr></wbr></p></body></html>
             </td>
           </tr>
+
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
         
diff --git a/camera/docs/html.mako b/camera/docs/html.mako
index df11384..e65ad83 100644 (file)
--- a/camera/docs/html.mako
+++ b/camera/docs/html.mako
@@ -145,6 +145,13 @@
   def md_html(text):
     # prepend the image directory path to each <img src="...">
     return md(text, IMAGE_SRC_METADATA)
+
+  # Number of rows an entry will span
+  def entry_cols(prop):
+    cols = 1
+    if prop.details: cols = cols + 2
+    if prop.hal_details: cols = cols + 2
+    return cols
 %>
 
 <body>
@@ -236,25 +243,10 @@ ${          insert_toc_body(kind)}\
         </%def>
 
         <%def name="insert_entry(prop)">
-        % if False: #prop.is_clone():
-            <clone entry="${prop.name}" kind="${prop.target_kind}">
-
-              % if prop.notes is not None:
-                <notes>${prop.notes | h,wbr}</notes>
-              % endif
-
-              % for tag in prop.tags:
-                <tag id="${tag.id}" />
-              % endfor
-
-            </clone>
-        % else:
           <tr class="entry" id="${prop.kind}_${prop.name}">
-            <td class="entry_name"
-                % if prop.notes is not None:
-                  rowspan="3"
-                % endif
-                >${prop.name | wbr}</td>
+            <td class="entry_name" rowspan="${entry_cols(prop)}">
+              ${prop.name | wbr}
+            </td>
             <td class="entry_type">
               % if prop.enum:
                 <span class="entry_type_name entry_type_name_enum">${prop.type}</span>
@@ -331,19 +323,30 @@ ${          insert_toc_body(kind)}\
             </td>
 
           </tr>
-          % if prop.notes is not None:
+          % if prop.details is not None:
           <tr class="entries_header">
             <th class="th_details" colspan="5">Details</th>
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              ${prop.notes | md_html, wbr}
+              ${prop.details | md_html, wbr}
             </td>
           </tr>
           % endif
+
+          % if prop.hal_details is not None:
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">HAL Implementation Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              ${prop.hal_details | md_html, wbr}
+            </td>
+          </tr>
+          % endif
+
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
            <!-- end of entry -->
-        % endif
         </%def>
 
         ${insert_body(kind)}
diff --git a/camera/docs/metadata_model.py b/camera/docs/metadata_model.py
index 7db5ffe..9a920ab 100644 (file)
--- a/camera/docs/metadata_model.py
+++ b/camera/docs/metadata_model.py
@@ -1066,7 +1066,8 @@ class Entry(Node):
       description: A string with a description of the entry.
       range: A string with the range of the values of the entry, e.g. '>= 0'
       units: A string with the units of the values, e.g. 'inches'
-      notes: A string with the notes for the entry
+      details: A string with the detailed documentation for the entry
+      hal_details: A string with the HAL implementation details for the entry
       tag_ids: A list of tag ID strings, e.g. ['BC', 'V1']
       type_notes: A string with the notes for the type
       visibility: A string describing the visibility, eg 'system', 'hidden',
@@ -1147,8 +1148,12 @@ class Entry(Node):
     return self._units
 
   @property
-  def notes(self):
-    return self._notes
+  def details(self):
+    return self._details
+
+  @property
+  def hal_details(self):
+    return self._hal_details
 
   @property
   def tags(self):
@@ -1202,7 +1207,8 @@ class Entry(Node):
     self._description = kwargs.get('description')
     self._range = kwargs.get('range')
     self._units = kwargs.get('units')
-    self._notes = kwargs.get('notes')
+    self._details = kwargs.get('details')
+    self._hal_details = kwargs.get('hal_details')
 
     self._tag_ids = kwargs.get('tag_ids', [])
     self._tags = None  # Filled in by Metadata::_construct_tags
@@ -1344,7 +1350,8 @@ class Clone(Entry):
       description: A string with a description of the entry.
       range: A string with the range of the values of the entry, e.g. '>= 0'
       units: A string with the units of the values, e.g. 'inches'
-      notes: A string with the notes for the entry
+      details: A string with the detailed documentation for the entry
+      hal_details: A string with the HAL implementation details for the entry
       tag_ids: A list of tag ID strings, e.g. ['BC', 'V1']
       type_notes: A string with the notes for the type
 
@@ -1397,7 +1404,8 @@ class MergedEntry(Entry):
     Args:
       entry: An Entry or Clone instance
     """
-    props_distinct = ['description', 'units', 'range', 'notes', 'tags', 'kind']
+    props_distinct = ['description', 'units', 'range', 'details',
+                      'hal_details', 'tags', 'kind']
 
     for p in props_distinct:
       p = '_' + p
diff --git a/camera/docs/metadata_parser_xml.py b/camera/docs/metadata_parser_xml.py
index 6772282..dd53131 100755 (executable)
--- a/camera/docs/metadata_parser_xml.py
+++ b/camera/docs/metadata_parser_xml.py
@@ -225,7 +225,7 @@ class MetadataParserXml:
   def _parse_entry_optional(self, entry):
     d = {}
 
-    optional_elements = ['description', 'range', 'units', 'notes']
+    optional_elements = ['description', 'range', 'units', 'details', 'hal_details']
     for i in optional_elements:
       prop = find_child_tag(entry, i)
 
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index bc2a208..f148c7c 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -81,8 +81,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             </value>
           </enum>
 
-          <notes>When android.control.awbMode is not OFF, TRANSFORM_MATRIX
-          should be ignored.</notes>
+          <details>When android.control.awbMode is not OFF, TRANSFORM_MATRIX
+          should be ignored.</details>
         </entry>
         <entry name="transform" type="rational" visibility="public"
                type_notes="3x3 rational matrix in row-major order"
@@ -96,14 +96,14 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </description>
           <range>Output values are expected to be in the range
           (0,1)</range>
-          <notes>This matrix is either set by HAL when the request
+          <details>This matrix is either set by HAL when the request
           android.colorCorrection.mode is not TRANSFORM_MATRIX, or
           directly by the application in the request when the
           android.colorCorrection.mode is TRANSFORM_MATRIX.
 
           In the latter case, the HAL may round the matrix to account
           for precision issues; the final rounded matrix should be
-          reported back in this matrix result metadata.</notes>
+          reported back in this matrix result metadata.</details>
         </entry>
         <entry name="gains" type="float" visibility="public"
                type_notes="A 1D array of floats for 4 color channel gains"
@@ -113,7 +113,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>Gains applying to Bayer color channels for
           white-balance</description>
-          <notes>The 4-channel white-balance gains are defined in
+          <details>The 4-channel white-balance gains are defined in
           the order of [R G_even G_odd B], where G_even is the gain
           for green pixels on even rows of the output, and G_odd
           is the gain for greenpixels on the odd rows. if a HAL
@@ -127,7 +127,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           android.colorCorrection.mode is TRANSFORM_MATRIX.
 
           The ouput should be the gains actually applied by the HAL to
-          the current frame.</notes>
+          the current frame.</details>
         </entry>
       </controls>
       <dynamic>
@@ -156,9 +156,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Adjustment to AE target image
           brightness</description>
           <units>count of positive/negative EV steps</units>
-          <notes>For example, if EV step is 0.333, '6' will mean an
+          <details>For example, if EV step is 0.333, '6' will mean an
           exposure compensation of +2 EV; -3 will mean an exposure
-          compensation of -1</notes>
+          compensation of -1</details>
           <tag id="BC" />
         </entry>
         <entry name="aeLock" type="byte" visibility="public" enum="true"
@@ -174,9 +174,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Whether AE is currently locked to its latest
           calculated values</description>
-          <notes>Note that even when AE is locked, the flash may be
+          <details>Note that even when AE is locked, the flash may be
           fired if the AE mode is ON_AUTO_FLASH / ON_ALWAYS_FLASH /
-          ON_AUTO_FLASH_REDEYE.</notes>
+          ON_AUTO_FLASH_REDEYE.</details>
           <tag id="BC" />
         </entry>
         <entry name="aeMode" type="byte" visibility="public" enum="true">
@@ -208,7 +208,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Whether AE is currently updating the sensor
           exposure and sensitivity fields</description>
           <range>android.control.aeAvailableModes</range>
-          <notes>Only effective if android.control.mode = AUTO.
+          <details>Only effective if android.control.mode = AUTO.
 
           If auto-exposure is active, HAL auto-focus routine is enabled,
           then HAL auto-exposure routine overrides the control variables
@@ -218,7 +218,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           For example, if auto-exposure is enabled in a request, the HAL should
           overwrite the exposure, gain, and frame duration fields (and potentially
           the flash fields, depending on AE mode) of the request.  The overridden
-          values are then provided back to the user in the corresponding result.</notes>
+          values are then provided back to the user in the corresponding result.</details>
           <tag id="BC" />
         </entry>
         <entry name="aeRegions" type="int32" visibility="public"
@@ -229,7 +229,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>List of areas to use for
           metering</description>
-          <notes>Each area is a rectangle plus weight: xmin, ymin,
+          <details>Each area is a rectangle plus weight: xmin, ymin,
           xmax, ymax, weight. The rectangle is defined inclusive of the
           specified coordinates.
 
@@ -244,7 +244,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           needs to be used by the HAL. If the metering region is
           outside the current android.scaler.cropRegion, the HAL
           should ignore the sections outside the region and output the
-          used sections in the frame metadata</notes>
+          used sections in the frame metadata</details>
           <tag id="BC" />
         </entry>
         <entry name="aeTargetFpsRange" type="int32" visibility="public"
@@ -255,8 +255,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Range over which fps can be adjusted to
           maintain exposure</description>
           <range>android.control.aeAvailableTargetFpsRanges</range>
-          <notes>Only constrains AE algorithm, not manual control
-          of android.sensor.exposureTime</notes>
+          <details>Only constrains AE algorithm, not manual control
+          of android.sensor.exposureTime</details>
           <tag id="BC" />
         </entry>
         <entry name="aePrecaptureTrigger" type="byte" visibility="public"
@@ -274,14 +274,14 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Whether the HAL must trigger precapture
           metering.</description>
-          <notes>This entry is normally set to IDLE, or is not
+          <details>This entry is normally set to IDLE, or is not
           included at all in the request settings. When included and
           set to START, the HAL must trigger the autoexposure
           precapture metering sequence.
 
           The effect of AE precapture trigger depends on the current
           AE mode and state; see the camera HAL device v3 header for
-          details.</notes>
+          details.</details>
           <tag id="BC" />
         </entry>
         <entry name="afMode" type="byte" visibility="public" enum="true">
@@ -357,11 +357,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Whether AF is currently enabled, and what
           mode it is set to</description>
-          <notes>Only effective if android.control.mode = AUTO.
+          <details>Only effective if android.control.mode = AUTO.
 
           If lens is controlled by HAL auto-focus algorithm, the HAL should
           report the current AF status in android.control.afState in
-          result metadata.</notes>
+          result metadata.</details>
           <tag id="BC" />
         </entry>
         <entry name="afRegions" type="int32" visibility="public"
@@ -372,7 +372,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>List of areas to use for focus
           estimation</description>
-          <notes>Each area is a rectangle plus weight: xmin, ymin,
+          <details>Each area is a rectangle plus weight: xmin, ymin,
           xmax, ymax, weight. The rectangle is defined inclusive of the
           specified coordinates.
 
@@ -387,7 +387,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           needs to be used by the HAL. If the focusing region is
           outside the current android.scaler.cropRegion, the HAL
           should ignore the sections outside the region and output the
-          used sections in the frame metadata</notes>
+          used sections in the frame metadata</details>
           <tag id="BC" />
         </entry>
         <entry name="afTrigger" type="byte" visibility="public" enum="true">
@@ -404,14 +404,14 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             </value>
           </enum>
           <description>Whether the HAL must trigger autofocus.</description>
-          <notes>This entry is normally set to IDLE, or is not
+          <details>This entry is normally set to IDLE, or is not
           included at all in the request settings.
 
           When included and set to START, the HAL must trigger the
           autofocus algorithm. The effect of AF trigger depends on the
           current AF mode and state; see the camera HAL device v3
           header for details. When set to CANCEL, the HAL must cancel
-          any active trigger, and return to initial AF state.</notes>
+          any active trigger, and return to initial AF state.</details>
           <tag id="BC" />
         </entry>
         <entry name="awbLock" type="byte" visibility="public" enum="true"
@@ -428,9 +428,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Whether AWB is currently locked to its
           latest calculated values</description>
-          <notes>Note that AWB lock is only meaningful for AUTO
+          <details>Note that AWB lock is only meaningful for AUTO
           mode; in other modes, AWB is already fixed to a specific
-          setting</notes>
+          setting</details>
           <tag id="BC" />
         </entry>
         <entry name="awbMode" type="byte" visibility="public" enum="true">
@@ -448,9 +448,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Whether AWB is currently setting the color
           transform fields, and what its illumination target
           is</description>
-          <notes>[BC - AWB lock,AWB modes]
+          <details>[BC - AWB lock,AWB modes]
 
-          Only effective if android.control.mode = AUTO.</notes>
+          Only effective if android.control.mode = AUTO.</details>
           <tag id="BC" />
           <tag id="AWB" />
         </entry>
@@ -462,7 +462,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>List of areas to use for illuminant
           estimation</description>
-          <notes>Only used in AUTO mode.
+          <details>Only used in AUTO mode.
 
           Each area is a rectangle plus weight: xmin, ymin,
           xmax, ymax, weight. The rectangle is defined inclusive of the
@@ -479,7 +479,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           needs to be used by the HAL. If the metering region is
           outside the current android.scaler.cropRegion, the HAL
           should ignore the sections outside the region and output the
-          used sections in the frame metadata</notes>
+          used sections in the frame metadata</details>
           <tag id="BC" />
         </entry>
         <entry name="captureIntent" type="byte" visibility="public" enum="true">
@@ -511,7 +511,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           of this capture, to help decide optimal 3A
           strategy</description>
           <range>all must be supported</range>
-          <notes>Only used if android.control.mode != OFF.</notes>
+          <details>Only used if android.control.mode != OFF.</details>
           <tag id="BC" />
         </entry>
         <entry name="effectMode" type="byte" visibility="public" enum="true">
@@ -554,7 +554,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Overall mode of 3A control
           routines</description>
           <range>all must be supported</range>
-          <notes>High-level 3A control. When set to OFF, all 3A control
+          <details>High-level 3A control. When set to OFF, all 3A control
           by the HAL is disabled. The application must set the fields for
           capture parameters itself.
 
@@ -565,7 +565,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           android.control.* are mostly disabled, and the HAL implements
           one of the scene mode settings (such as ACTION, SUNSET, or PARTY)
           as it wishes. The HAL scene mode 3A settings are provided by
-          android.control.sceneModeOverrides.</notes>
+          android.control.sceneModeOverrides.</details>
           <tag id="BC" />
         </entry>
         <entry name="sceneMode" type="byte" visibility="public" enum="true">
@@ -611,9 +611,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Whether video stabilization is
           active</description>
-          <notes>If enabled, video stabilization can modify the
+          <details>If enabled, video stabilization can modify the
           android.scaler.cropRegion to keep the video stream
-          stabilized</notes>
+          stabilized</details>
           <tag id="BC" />
         </entry>
       </controls>
@@ -737,7 +737,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
           For each entry, the order is {aeMode, awbMode, afMode} in
           order of increasing index</range>
-          <notes>When a scene mode is enabled, the HAL is expected
+          <details>When a scene mode is enabled, the HAL is expected
           to override aeMode, awbMode, and afMode with its
           preferred settings for that scene mode.
 
@@ -755,7 +755,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           { FACE_PRIORITY, ACTION, NIGHT }, then the service expects
           this field to have 9 entries; for example { 0 , 0, 0,
           ON_AUTO_FLASH, AUTO, CONTINUOUS_PICTURE, ON_AUTO_FLASH,
-          INCANDESCENT, AUTO }</notes>
+          INCANDESCENT, AUTO }</details>
           <tag id="BC" />
         </entry>
       </static>
@@ -763,10 +763,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
         <entry name="aePrecaptureId" type="int32" visibility="hidden">
           <description>The ID sent with the latest
           CAMERA2_TRIGGER_PRECAPTURE_METERING call</description>
-          <notes>Must be 0 if no
+          <details>Must be 0 if no
           CAMERA2_TRIGGER_PRECAPTURE_METERING trigger received yet
           by HAL. Always updated even if AE algorithm ignores the
-          trigger</notes>
+          trigger</details>
         </entry>
         <clone entry="android.control.aeRegions" kind="controls">
         </clone>
@@ -797,9 +797,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             FLASH_REQUIRED as appropriate</notes></value>
           </enum>
           <description>Current state of AE algorithm</description>
-          <notes>Whenever the AE algorithm state changes, a
+          <details>Whenever the AE algorithm state changes, a
           MSG_AUTOEXPOSURE notification must be send if a
-          notification callback is registered.</notes>
+          notification callback is registered.</details>
         </entry>
         <clone entry="android.control.afMode" kind="controls">
         </clone>
@@ -837,16 +837,16 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             scanning at any time.</notes></value>
           </enum>
           <description>Current state of AF algorithm</description>
-          <notes>Whenever the AF algorithm state changes, a
+          <details>Whenever the AF algorithm state changes, a
           MSG_AUTOFOCUS notification must be send if a notification
-          callback is registered.</notes>
+          callback is registered.</details>
         </entry>
         <entry name="afTriggerId" type="int32" visibility="hidden">
           <description>The ID sent with the latest
           CAMERA2_TRIGGER_AUTOFOCUS call</description>
-          <notes>Must be 0 if no CAMERA2_TRIGGER_AUTOFOCUS trigger
+          <details>Must be 0 if no CAMERA2_TRIGGER_AUTOFOCUS trigger
           received yet by HAL. Always updated even if AF algorithm
-          ignores the trigger</notes>
+          ignores the trigger</details>
         </entry>
         <clone entry="android.control.awbMode" kind="controls">
         </clone>
@@ -868,9 +868,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             LOCKED)</notes></value>
           </enum>
           <description>Current state of AWB algorithm</description>
-          <notes>Whenever the AWB algorithm state changes, a
+          <details>Whenever the AWB algorithm state changes, a
           MSG_AUTOWHITEBALANCE notification must be send if a
-          notification callback is registered.</notes>
+          notification callback is registered.</details>
         </entry>
         <clone entry="android.control.mode" kind="controls">
         </clone>
@@ -908,14 +908,14 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Operation mode for edge
           enhancement</description>
-          <notes>Edge/sharpness/detail enhancement. OFF means no
+          <details>Edge/sharpness/detail enhancement. OFF means no
           enhancement will be applied by the HAL.
 
           FAST/HIGH_QUALITY both mean HAL-determined enhancement
           will be applied. HIGH_QUALITY mode indicates that the
           HAL should use the highest-quality enhancement algorithms,
           even if it slows down capture rate. FAST means the HAL should
-          not slow down capture rate when applying edge enhancement.</notes>
+          not slow down capture rate when applying edge enhancement.</details>
         </entry>
         <entry name="strength" type="byte">
           <description>Control the amount of edge enhancement
@@ -933,9 +933,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Power for flash firing/torch</description>
           <units>10 is max power; 0 is no flash. Linear</units>
           <range>0 - 10</range>
-          <notes>Power for snapshot may use a different scale than
+          <details>Power for snapshot may use a different scale than
           for torch mode. Only one entry for torch mode will be
-          used</notes>
+          used</details>
           <tag id="V1" />
         </entry>
         <entry name="firingTime" type="int64">
@@ -943,8 +943,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           exposure</description>
           <units>nanoseconds</units>
           <range>0-(exposure time-flash duration)</range>
-          <notes>Clamped to (0, exposure time - flash
-          duration).</notes>
+          <details>Clamped to (0, exposure time - flash
+          duration).</details>
           <tag id="V1" />
         </entry>
         <entry name="mode" type="byte" visibility="public" enum="true">
@@ -971,8 +971,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             <description>Whether this camera has a
             flash</description>
             <units>boolean (0 = false, otherwise true)</units>
-            <notes>If no flash, none of the flash controls do
-            anything. All other metadata should return 0</notes>
+            <details>If no flash, none of the flash controls do
+            anything. All other metadata should return 0</details>
             <tag id="BC" />
           </entry>
           <entry name="chargeDuration" type="int64">
@@ -980,8 +980,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             again</description>
             <units>nanoseconds</units>
             <range>0-1e9</range>
-            <notes>1 second too long/too short for recharge? Should
-            this be power-dependent?</notes>
+            <details>1 second too long/too short for recharge? Should
+            this be power-dependent?</details>
             <tag id="V1" />
           </entry>
         </namespace>
@@ -1128,7 +1128,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Compression quality of the final JPEG
           image</description>
           <range>1-100; larger is higher quality</range>
-          <notes>85-95 is typical usage range</notes>
+          <details>85-95 is typical usage range</details>
           <tag id="BC" />
         </entry>
         <entry name="thumbnailQuality" type="byte" visibility="public">
@@ -1144,11 +1144,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>Resolution of embedded JPEG thumbnail</description>
           <range>Size must be one of the size from android.jpeg.availableThumbnailSizes</range>
-          <notes>When set to (0, 0) value, the JPEG EXIF must not contain thumbnail,
+          <details>When set to (0, 0) value, the JPEG EXIF must not contain thumbnail,
           but the captured JPEG must still be a valid image.
 
           When a jpeg image capture is issued, the thumbnail size selected should have
-          the same aspect ratio as the jpeg image.</notes>
+          the same aspect ratio as the jpeg image.</details>
           <tag id="BC" />
         </entry>
       </controls>
@@ -1162,7 +1162,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Supported resolutions for the JPEG thumbnail</description>
           <range>Must include at least one valid resolution, plus
           (0,0) for no thumbnail generation, and each size must be distinct.</range>
-          <notes>Below condiditions must be satisfied for this size list:
+          <details>Below condiditions must be satisfied for this size list:
 
           * The sizes must be sorted by increasing pixel area (width x height).
           If several resolutions have the same area, they must be sorted by increasing width.
@@ -1173,7 +1173,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           * Each size in android.scaler.availableJpegSizes must have at least
           one corresponding size that has the same aspect ratio in availableThumbnailSizes,
           and vice versa.
-          * All non (0, 0) sizes must have non-zero widths and heights.</notes>
+          * All non (0, 0) sizes must have non-zero widths and heights.</details>
           <tag id="BC" />
         </entry>
         <entry name="maxSize" type="int32" visibility="system">
@@ -1181,8 +1181,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           JPEG buffer</description>
           <range>Must be large enough to fit any JPEG produced by
           the camera</range>
-          <notes>This is used for sizing the gralloc buffers for
-          JPEG</notes>
+          <details>This is used for sizing the gralloc buffers for
+          JPEG</details>
         </entry>
       </static>
       <dynamic>
@@ -1200,7 +1200,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>The size of the compressed JPEG image, in
           bytes</description>
           <range>&gt;= 0</range>
-          <notes>If no JPEG output is produced for the request,
+          <details>If no JPEG output is produced for the request,
           this must be 0.
 
           Otherwise, this describes the real size of the compressed
@@ -1208,7 +1208,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           if android.jpeg.maxSize = 1000000, and a specific capture
           has android.jpeg.size = 500000, then the output buffer from
           the JPEG stream will be 1000000 bytes, of which the first
-          500000 make up the real data.</notes>
+          500000 make up the real data.</details>
         </entry>
         <clone entry="android.jpeg.thumbnailQuality"
         kind="controls"></clone>
@@ -1222,8 +1222,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Size of the lens aperture</description>
           <units>f-number (f/NNN)</units>
           <range>android.lens.info.availableApertures</range>
-          <notes>Will not be supported on most devices. Can only
-          pick from supported list</notes>
+          <details>Will not be supported on most devices. Can only
+          pick from supported list</details>
           <tag id="V1" />
         </entry>
         <entry name="filterDensity" type="float" visibility="public">
@@ -1231,15 +1231,15 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           filter(s)</description>
           <units>number of stops of filtering</units>
           <range>android.lens.info.availableFilterDensities</range>
-          <notes>Will not be supported on most devices. Can only
-          pick from supported list</notes>
+          <details>Will not be supported on most devices. Can only
+          pick from supported list</details>
           <tag id="V1" />
         </entry>
         <entry name="focalLength" type="float" visibility="public">
           <description>Lens optical zoom setting</description>
           <units>focal length in mm</units>
           <range>&gt; 0</range>
-          <notes>Will not be supported on most devices.</notes>
+          <details>Will not be supported on most devices.</details>
           <tag id="V1" />
         </entry>
         <entry name="focusDistance" type="float" visibility="public">
@@ -1247,8 +1247,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           measured from frontmost surface of the lens</description>
           <units>diopters (1/m)</units>
           <range>&gt;= 0</range>
-          <notes>0 = infinity focus. Used value should be clamped
-          to (0,minimum focus distance)</notes>
+          <details>0 = infinity focus. Used value should be clamped
+          to (0,minimum focus distance)</details>
           <tag id="BC" />
           <tag id="V1" />
         </entry>
@@ -1261,7 +1261,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Whether optical image stabilization is
           enabled.</description>
           <range>android.lens.availableOpticalStabilization</range>
-          <notes>Will not be supported on most devices.</notes>
+          <details>Will not be supported on most devices.</details>
           <tag id="V1" />
         </entry>
       </controls>
@@ -1275,8 +1275,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             <description>List of supported aperture
             values</description>
             <range>one entry required, &gt; 0</range>
-            <notes>If variable aperture not available, only setting
-            should be for the fixed aperture</notes>
+            <details>If variable aperture not available, only setting
+            should be for the fixed aperture</details>
             <tag id="V1" />
           </entry>
           <entry name="availableFilterDensities" type="float" visibility="public"
@@ -1287,10 +1287,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             <description>List of supported ND filter
             values</description>
             <range>one entry required, &gt;= 0</range>
-            <notes>If not available, only setting is 0. Otherwise,
+            <details>If not available, only setting is 0. Otherwise,
             lists the available exposure index values for dimming
             (2 would mean the filter is set to reduce incoming
-            light by two stops)</notes>
+            light by two stops)</details>
             <tag id="V1" />
           </entry>
           <entry name="availableFocalLengths" type="float" visibility="public"
@@ -1303,8 +1303,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             lengths are available. If not, the static focal
             length</description>
             <range>&gt; 0</range>
-            <notes>If optical zoom not supported, only one value
-            should be reported</notes>
+            <details>If optical zoom not supported, only one value
+            should be reported</details>
             <tag id="BC" />
             <tag id="V1" />
           </entry>
@@ -1330,11 +1330,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             geometric distortions and chromatic aberrations, per
             color channel</description>
             <range>N, M &gt;= 2</range>
-            <notes>[DNG wants a function instead]. What's easiest
+            <details>[DNG wants a function instead]. What's easiest
             for implementers? With an array size (M, N), entry (i,
             j) provides the destination for pixel (i/(M-1) * width,
             j/(N-1) * height). Data is row-major, with each array
-            entry being ( (X, Y)_r, (X, Y)_g, (X, Y)_b ) )</notes>
+            entry being ( (X, Y)_r, (X, Y)_g, (X, Y)_b ) )</details>
             <tag id="DNG" />
           </entry>
           <entry name="geometricCorrectionMapSize" type="int32"
@@ -1353,8 +1353,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             0 if fixed focus</description>
             <units>diopters</units>
             <range>&gt;= 0</range>
-            <notes>The hyperfocal distance is used for the old
-            API's 'fixed' setting</notes>
+            <details>The hyperfocal distance is used for the old
+            API's 'fixed' setting</details>
             <tag id="BC" />
           </entry>
           <entry name="minimumFocusDistance" type="float" visibility="public">
@@ -1362,8 +1362,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             of the lens that can be focused correctly</description>
             <units>diopters</units>
             <range>&gt;= 0</range>
-            <notes>If the lens is fixed-focus, this should be
-            0</notes>
+            <details>If the lens is fixed-focus, this should be
+            0</details>
             <tag id="V1" />
           </entry>
           <entry name="shadingMapSize" type="int32" visibility="public"
@@ -1374,10 +1374,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             </array>
             <description>Dimensions of lens shading map.</description>
             <range>Both values &gt;= 1</range>
-            <notes>
+            <details>
             The map should be on the order of 30-40 rows and columns, and
             must be smaller than 64x64.
-            </notes>
+            </details>
             <tag id="V1" />
           </entry>
         </namespace>
@@ -1398,7 +1398,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Relative angle of camera optical axis to the
           perpendicular axis from the display</description>
           <range>[0-90) for first angle, [0-360) for second</range>
-          <notes>Examples:
+          <details>Examples:
 
           (0,0) means that the camera optical axis
           is perpendicular to the display surface;
@@ -1410,7 +1410,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           the device is held upright.
 
           Use FACING field to determine perpendicular outgoing
-          direction</notes>
+          direction</details>
           <tag id="ADV" />
         </entry>
         <entry name="position" type="float" container="array">
@@ -1434,7 +1434,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <tag id="BC" />
         </clone>
         <clone entry="android.lens.focusDistance" kind="controls">
-          <notes>Should be zero for fixed-focus cameras</notes>
+          <details>Should be zero for fixed-focus cameras</details>
           <tag id="BC" />
         </clone>
         <entry name="focusRange" type="float" visibility="public"
@@ -1448,8 +1448,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <units>pair of focus distances in diopters: (near,
           far)</units>
           <range>&gt;=0</range>
-          <notes>If variable focus not supported, can still report
-          fixed depth of field range</notes>
+          <details>If variable focus not supported, can still report
+          fixed depth of field range</details>
           <tag id="BC" />
         </entry>
         <clone entry="android.lens.opticalStabilizationMode"
@@ -1482,14 +1482,14 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Mode of operation for the noise reduction
           algorithm</description>
           <range>android.noiseReduction.availableModes</range>
-          <notes>Noise filtering control. OFF means no noise reduction
+          <details>Noise filtering control. OFF means no noise reduction
           will be applied by the HAL.
 
           FAST/HIGH_QUALITY both mean HAL-determined noise filtering
           will be applied. HIGH_QUALITY mode indicates that the HAL
           should use the highest-quality noise filtering algorithms,
           even if it slows down capture rate. FAST means the HAL should not
-          slow down capture rate when applying noise filtering.</notes>
+          slow down capture rate when applying noise filtering.</details>
           <tag id="V1" />
         </entry>
         <entry name="strength" type="byte">
@@ -1511,48 +1511,48 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           scale 'normalized' coordinates with respect to the crop
           region. This applies to metering input (a{e,f,wb}Region
           and output (face rectangles).</description>
-          <notes>Normalized coordinates refer to those in the
+          <details>Normalized coordinates refer to those in the
           (-1000,1000) range mentioned in the
           android.hardware.Camera API.
 
           HAL implementations should instead always use and emit
           sensor array-relative coordinates for all region data. Does
           not need to be listed in static metadata. Support will be
-          removed in future versions of camera service.</notes>
+          removed in future versions of camera service.</details>
         </entry>
         <entry name="triggerAfWithAuto" type="byte" visibility="system" optional="true">
           <description>If set to 1, then the camera service always
           switches to FOCUS_MODE_AUTO before issuing a AF
           trigger.</description>
-          <notes>HAL implementations should implement AF trigger
+          <details>HAL implementations should implement AF trigger
           modes for AUTO, MACRO, CONTINUOUS_FOCUS, and
           CONTINUOUS_PICTURE modes instead of using this flag. Does
           not need to be listed in static metadata. Support will be
-          removed in future versions of camera service</notes>
+          removed in future versions of camera service</details>
         </entry>
         <entry name="useZslFormat" type="byte" visibility="system" optional="true">
           <description>If set to 1, the camera service uses
           CAMERA2_PIXEL_FORMAT_ZSL instead of
           HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED for the zero
           shutter lag stream</description>
-          <notes>HAL implementations should use gralloc usage flags
+          <details>HAL implementations should use gralloc usage flags
           to determine that a stream will be used for
           zero-shutter-lag, instead of relying on an explicit
           format setting. Does not need to be listed in static
           metadata. Support will be removed in future versions of
-          camera service.</notes>
+          camera service.</details>
         </entry>
         <entry name="usePartialResult" type="byte" visibility="hidden" optional="true">
           <description>If set to 1, the HAL will always split result
           metadata for a single capture into multiple buffers,
           returned using multiple process_capture_result calls.
           </description>
-          <notes>Does not need to be listed in static
+          <details>Does not need to be listed in static
           metadata. Support for partial results will be reworked in
           future versions of camera service. This quirk will stop
           working at that point; DO NOT USE without careful
           consideration of future support.
-          </notes>
+          </details>
         </entry>
 
       </static>
@@ -1575,7 +1575,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           subset of the full set of dynamic metadata
           values.</description>
           <range>Optional. Default value is FINAL.</range>
-          <notes>The entries in the result metadata buffers for a
+          <details>The entries in the result metadata buffers for a
           single capture may not overlap, except for this entry. The
           FINAL buffers must retain FIFO ordering relative to the
           requests that generate them, so the FINAL buffer for frame 3 must
@@ -1584,7 +1584,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           in any order relative to other frames, but all PARTIAL buffers for a given
           capture must arrive before the FINAL buffer for that capture. This entry may
           only be used by the HAL if quirks.usePartialResult is set to 1.
-          </notes>
+          </details>
         </entry>
       </dynamic>
     </section>
@@ -1621,8 +1621,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           If android.jpeg.needsThumbnail is set, then multiple
           reprocess streams may be included in a single request; they
           must be different scaled versions of the same image.</range>
-          <notes>Only meaningful when android.request.type ==
-          REPROCESS. Ignored otherwise</notes>
+          <details>Only meaningful when android.request.type ==
+          REPROCESS. Ignored otherwise</details>
           <tag id="HAL2" />
         </entry>
         <entry name="metadataMode" type="byte" visibility="system"
@@ -1655,10 +1655,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <units>List of camera stream IDs</units>
           <range>List must only include streams that have been
           created</range>
-          <notes>If no output streams are listed, then the image
+          <details>If no output streams are listed, then the image
           data should simply be discarded. The image data must
           still be captured for metadata and statistics production,
-          and the lens and flash must operate as requested.</notes>
+          and the lens and flash must operate as requested.</details>
           <tag id="HAL2" />
         </entry>
         <entry name="type" type="byte" visibility="system" enum="true">
@@ -1691,9 +1691,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           JPEG-compressed streams</units>
           <range>&gt;=1 for Raw and JPEG-compressed stream. &gt;= 3
           for processed, uncompressed streams</range>
-          <notes>Video snapshot with preview callbacks requires 3
+          <details>Video snapshot with preview callbacks requires 3
           processed streams (preview, record, app callbacks) and
-          one JPEG stream (snapshot)</notes>
+          one JPEG stream (snapshot)</details>
           <tag id="BC" />
         </entry>
         <entry name="maxNumReprocessStreams" type="int32" visibility="system"
@@ -1713,7 +1713,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           frameCount value).</description>
           <units>count of frames</units>
           <range>&gt; 0</range>
-          <notes>Reset on release()</notes>
+          <details>Reset on release()</details>
         </entry>
         <clone entry="android.request.id" kind="controls"></clone>
         <clone entry="android.request.metadataMode"
@@ -1741,7 +1741,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <units>(x,y) of top-left corner, width and height of region
           in pixels; (0,0) is top-left corner of
           android.sensor.activeArraySize</units>
-          <notes>
+          <details>
             Any additional per-stream cropping must be done to
             maximize the final pixel area of the stream.
 
@@ -1767,7 +1767,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             android.scaler.maxDigitalZoom ) and floor(
             activeArraySize.height / android.scaler.maxDigitalZoom),
             respectively.
-          </notes>
+          </details>
           <tag id="BC" />
         </entry>
       </controls>
@@ -1814,9 +1814,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           correspond to the frame duration when only that JPEG
           stream is active and captured in a burst, with all
           processing set to FAST</description>
-          <notes>When multiple streams are configured, the minimum
+          <details>When multiple streams are configured, the minimum
           frame duration will be &gt;= max(individual stream min
-          durations)</notes>
+          durations)</details>
           <tag id="BC" />
         </entry>
         <entry name="availableJpegSizes" type="int32" visibility="public"
@@ -1849,9 +1849,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           correspond to the frame duration when only that processed
           stream is active, with all processing set to
           FAST</description>
-          <notes>When multiple streams are configured, the minimum
+          <details>When multiple streams are configured, the minimum
           frame duration will be &gt;= max(individual stream min
-          durations)</notes>
+          durations)</details>
           <tag id="BC" />
         </entry>
         <entry name="availableProcessedSizes" type="int32" visibility="public"
@@ -1867,13 +1867,13 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <range>Must include: - sensor maximum resolution -
           standard QCIF, 240p, 480p, 720p, and 1080p
           resolutions</range>
-          <notes>The actual supported resolution list may be limited by
+          <details>The actual supported resolution list may be limited by
           consumer end points for different use cases. For example, for
           recording use case, the largest supported resolution may be
           limited by max supported size from encoder, for preview use
           case, the largest supported resolution may be limited by max
           resolution SurfaceTexture/SurfaceView can support.
-          </notes>
+          </details>
           <tag id="BC" />
         </entry>
         <entry name="availableRawMinDurations" type="int64"
@@ -1885,9 +1885,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           for each raw resolution in availableRawSizes. Should
           correspond to the frame duration when only the raw stream
           is active.</description>
-          <notes>When multiple streams are configured, the minimum
+          <details>When multiple streams are configured, the minimum
           frame duration will be &gt;= max(individual stream min
-          durations)</notes>
+          durations)</details>
           <tag id="BC" />
         </entry>
         <entry name="availableRawSizes" type="int32"
@@ -1918,7 +1918,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </description>
           <units>nanoseconds</units>
           <range>android.sensor.info.exposureTimeRange</range>
-          <notes>1/10000 - 30 sec range. No bulb mode</notes>
+          <details>1/10000 - 30 sec range. No bulb mode</details>
           <tag id="V1" />
         </entry>
         <entry name="frameDuration" type="int64" visibility="public">
@@ -1927,8 +1927,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <units>nanoseconds</units>
           <range>see android.sensor.info.maxFrameDuration,
           android.scaler.info.availableMinFrameDurations</range>
-          <notes>Exposure time has priority, so duration is set to
-          max(duration, exposure time + overhead)</notes>
+          <details>Exposure time has priority, so duration is set to
+          max(duration, exposure time + overhead)</details>
           <tag id="V1" />
           <tag id="BC" />
         </entry>
@@ -1942,7 +1942,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </description>
           <units>ISO arithmetic units</units>
           <range>android.sensor.info.sensitivityRange</range>
-          <notes>ISO 12232:2006 REI method</notes>
+          <details>ISO 12232:2006 REI method</details>
           <tag id="V1" />
         </entry>
       </controls>
@@ -2005,11 +2005,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             rate)</description>
             <units>nanoseconds</units>
             <range>&gt;= 30e9</range>
-            <notes>Minimum duration is a function of resolution,
+            <details>Minimum duration is a function of resolution,
             processing settings. See
             android.scaler.availableProcessedMinDurations
             android.scaler.availableJpegMinDurations
-            android.scaler.availableRawMinDurations</notes>
+            android.scaler.availableRawMinDurations</details>
             <tag id="BC" />
             <tag id="V1" />
           </entry>
@@ -2021,7 +2021,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             </array>
             <description>The physical dimensions of the full pixel
             array</description>
-            <notes>Needed for FOV calculation for old API</notes>
+            <details>Needed for FOV calculation for old API</details>
             <tag id="V1" />
             <tag id="BC" />
           </entry>
@@ -2032,9 +2032,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             </array>
             <description>Dimensions of full pixel array, possibly
             including black calibration pixels</description>
-            <notes>Maximum output resolution for raw format must
+            <details>Maximum output resolution for raw format must
             match this in
-            android.scaler.info.availableSizesPerFormat</notes>
+            android.scaler.info.availableSizesPerFormat</details>
             <tag id="DNG" />
             <tag id="BC" />
           </entry>
@@ -2042,8 +2042,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             <description>Maximum raw value output by
             sensor</description>
             <range>&gt; 1024 (10-bit output)</range>
-            <notes>Defines sensor bit depth (10-14 bits is
-            expected)</notes>
+            <details>Defines sensor bit depth (10-14 bits is
+            expected)</details>
             <tag id="DNG" />
           </entry>
         </namespace>
@@ -2062,8 +2062,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>A fixed black level offset for each of the
           Bayer mosaic channels</description>
           <range>&gt;= 0 each</range>
-          <notes>As per DNG BlackLevelRepeatDim / BlackLevel
-          tags</notes>
+          <details>As per DNG BlackLevelRepeatDim / BlackLevel
+          tags</details>
           <tag id="DNG" />
         </entry>
         <entry name="calibrationTransform1" type="rational"
@@ -2095,9 +2095,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Linear mapping from XYZ (D50) color space to
           reference linear sensor color, for first reference
           illuminant</description>
-          <notes>Use as follows XYZ = inv(transform) * clip( (raw -
+          <details>Use as follows XYZ = inv(transform) * clip( (raw -
           black level(raw) ) / ( white level - max black level) ).
-          At least in the simple case</notes>
+          At least in the simple case</details>
           <tag id="DNG" />
         </entry>
         <entry name="colorTransform2" type="rational"
@@ -2135,10 +2135,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
         optional="true">
           <description>Maximum sensitivity that is implemented
           purely through analog gain</description>
-          <notes>For android.sensor.sensitivity values less than or
+          <details>For android.sensor.sensitivity values less than or
           equal to this, all applied gain must be analog. For
           values above this, it can be a mix of analog and
-          digital</notes>
+          digital</details>
           <tag id="V1" />
           <tag id="FULL" />
         </entry>
@@ -2153,11 +2153,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <units>var(raw pixel value) = electrons * (baseGainFactor
           * iso/100)^2 + A * (baseGainFactor * iso/100)^2 +
           B</units>
-          <notes>A represents sensor read noise before analog
+          <details>A represents sensor read noise before analog
           amplification; B represents noise from A/D conversion and
           other circuits after amplification. Both noise sources
           are assumed to be gaussian, independent, and not to vary
-          across the sensor</notes>
+          across the sensor</details>
           <tag id="V1" />
         </entry>
         <entry name="orientation" type="int32" visibility="public">
@@ -2200,8 +2200,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Light source used to define transform
           1</description>
-          <notes>[EXIF LightSource tag] Must all these be
-          supported? Need CCT for each!</notes>
+          <details>[EXIF LightSource tag] Must all these be
+          supported? Need CCT for each!</details>
           <tag id="DNG" />
           <tag id="EXIF" />
         </entry>
@@ -2223,8 +2223,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           row</description>
           <units>nanoseconds</units>
           <range>&gt; 0</range>
-          <notes>Monotonic, should be synced to other timestamps in
-          system</notes>
+          <details>Monotonic, should be synced to other timestamps in
+          system</details>
           <tag id="BC" />
         </entry>
         <entry name="temperature" type="float" visibility="public"
@@ -2287,10 +2287,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           unit</description>
           <range>
           android.statistics.info.availableFaceDetectModes</range>
-          <notes>Whether face detection is enabled, and whether it
+          <details>Whether face detection is enabled, and whether it
           should output just the basic fields or the full set of
           fields. Value must be one of the
-          android.statistics.info.availableFaceDetectModes.</notes>
+          android.statistics.info.availableFaceDetectModes.</details>
           <tag id="BC" />
         </entry>
         <entry name="histogramMode" type="byte" enum="true" typedef="boolean">
@@ -2327,7 +2327,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             OFF
             SIMPLE
             FULL</units>
-            <notes>OFF means face detection is disabled, it must
+            <details>OFF means face detection is disabled, it must
             be included in the list.
 
             SIMPLE means the device supports the
@@ -2337,7 +2337,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             FULL means the device additionally supports the
             android.statistics.faceIds and
             android.statistics.faceLandmarks outputs.
-            </notes>
+            </details>
           </entry>
           <entry name="histogramBucketCount" type="int32">
             <description>Number of histogram buckets
@@ -2378,7 +2378,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>List of unique IDs for detected
           faces</description>
-          <notes>Only available if faceDetectMode == FULL</notes>
+          <details>Only available if faceDetectMode == FULL</details>
           <tag id="BC" />
         </entry>
         <entry name="faceLandmarks" type="int32" visibility="hidden"
@@ -2390,7 +2390,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>List of landmarks for detected
           faces</description>
-          <notes>Only available if faceDetectMode == FULL</notes>
+          <details>Only available if faceDetectMode == FULL</details>
           <tag id="BC" />
         </entry>
         <entry name="faceRectangles" type="int32" visibility="hidden"
@@ -2402,7 +2402,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>List of the bounding rectangles for detected
           faces</description>
-          <notes>Only available if faceDetectMode != OFF</notes>
+          <details>Only available if faceDetectMode != OFF</details>
           <tag id="BC" />
         </entry>
         <entry name="faceScores" type="byte" visibility="hidden" container="array">
@@ -2412,8 +2412,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>List of the face confidence scores for
           detected faces</description>
           <range>1-100</range>
-          <notes>Only available if faceDetectMode != OFF. The value should be
-          meaningful (for example, setting 100 at all times is illegal).</notes>
+          <details>Only available if faceDetectMode != OFF. The value should be
+          meaningful (for example, setting 100 at all times is illegal).</details>
           <tag id="BC" />
         </entry>
         <entry name="histogram" type="int32"
@@ -2425,10 +2425,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>A 3-channel histogram based on the raw
           sensor data</description>
-          <notes>The k'th bucket (0-based) covers the input range
+          <details>The k'th bucket (0-based) covers the input range
           (with w = android.sensor.info.whiteLevel) of [ k * w/N,
           (k + 1) * w / N ). If only a monochrome sharpness map is
-          supported, all channels should have the same data</notes>
+          supported, all channels should have the same data</details>
           <tag id="V1" />
         </entry>
         <clone entry="android.statistics.histogramMode"
@@ -2443,8 +2443,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </array>
           <description>A 3-channel sharpness map, based on the raw
           sensor data</description>
-          <notes>If only a monochrome sharpness map is supported,
-          all channels should have the same data</notes>
+          <details>If only a monochrome sharpness map is supported,
+          all channels should have the same data</details>
           <tag id="V1" />
         </entry>
         <clone entry="android.statistics.sharpnessMapMode"
@@ -2461,7 +2461,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           that lists the coefficients used to correct for vignetting, for each
           Bayer color channel.</description>
           <range>Each gain factor is &gt;= 1</range>
-          <notes>The least shaded section of the image should have a gain factor
+          <details>The least shaded section of the image should have a gain factor
           of 1; all other sections should have gains above 1.
 
           When android.colorCorrection.mode = TRANSFORM_MATRIX, the map
@@ -2507,7 +2507,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           image of a gray wall (using bicubic interpolation for visual quality) as captured by the sensor gives:
 
           ![Image of a uniform white wall (inverse shading map)](android.statistics.lensShadingMap/inv_shading.png)
-          </notes>
+          </details>
         </entry>
         <entry name="predictedColorGains" type="float" visibility="public"
                type_notes="A 1D array of floats for 4 color channel gains"
@@ -2518,7 +2518,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>The best-fit color channel gains calculated
           by the HAL's statistics units for the current output frame
           </description>
-          <notes>
+          <details>
           This may be different than the gains used for this frame,
           since statistics processing on data from a new frame
           typically completes after the transform has already been
@@ -2529,7 +2529,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
           This value should always be calculated by the AWB block,
           regardless of the android.control.* current values.
-          </notes>
+          </details>
         </entry>
         <entry name="predictedColorTransform" type="rational" visibility="public"
                type_notes="3x3 rational matrix in row-major order"
@@ -2541,7 +2541,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>The best-fit color transform matrix estimate
           calculated by the HAL's statistics units for the current
           output frame</description>
-          <notes>The HAL must provide the estimate from its
+          <details>The HAL must provide the estimate from its
           statistics unit on the white balance transforms to use
           for the next frame. These are the values the HAL believes
           are the best fit for the current output frame. This may
@@ -2555,7 +2555,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
           This value should always be calculated by the AWB block,
           regardless of the android.control.* current values.
-          </notes>
+          </details>
         </entry>
         <entry name="sceneFlicker" type="byte" visibility="public" enum="true">
           <enum>
@@ -2565,8 +2565,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>The HAL estimated scene illumination lighting
           frequency</description>
-          <notes>Report NONE if there doesn't appear to be flickering
-          illumination</notes>
+          <details>Report NONE if there doesn't appear to be flickering
+          illumination</details>
         </entry>
       </dynamic>
       <controls>
@@ -2577,9 +2577,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Whether the HAL needs to output the lens
           shading map in output result metadata</description>
-          <notes>When set to ON,
+          <details>When set to ON,
           android.statistics.lensShadingMap must be provided in
-          the output result metadata.</notes>
+          the output result metadata.</details>
         </entry>
       </controls>
     </section>
@@ -2596,10 +2596,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           values</description>
           <units>same as android.tonemap.curveRed</units>
           <range>same as android.tonemap.curveRed</range>
-          <notes>Tonemapping / contrast / gamma curve for the blue
+          <details>Tonemapping / contrast / gamma curve for the blue
           channel, to use when android.tonemap.mode is CONTRAST_CURVE.
 
-          See android.tonemap.curveRed for more details.</notes>
+          See android.tonemap.curveRed for more details.</details>
         </entry>
         <entry name="curveGreen" type="float" visibility="public"
         type_notes="1D array of float pairs (P_IN, P_OUT). The maximum number of pairs is specified by android.tonemap.maxCurvePoints."
@@ -2612,10 +2612,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           values</description>
           <units>same as android.tonemap.curveRed</units>
           <range>same as android.tonemap.curveRed</range>
-          <notes>Tonemapping / contrast / gamma curve for the green
+          <details>Tonemapping / contrast / gamma curve for the green
           channel, to use when android.tonemap.mode is CONTRAST_CURVE.
 
-          See android.tonemap.curveRed for more details.</notes>
+          See android.tonemap.curveRed for more details.</details>
         </entry>
         <entry name="curveRed" type="float" visibility="public"
         type_notes="1D array of float pairs (P_IN, P_OUT). The maximum number of pairs is specified by android.tonemap.maxCurvePoints."
@@ -2627,7 +2627,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <description>Table mapping red input values to output
           values</description>
           <range>0-1 on input and output coordinates.</range>
-          <notes>Tonemapping / contrast / gamma curve for the red
+          <details>Tonemapping / contrast / gamma curve for the red
           channel, to use when android.tonemap.mode is CONTRAST_CURVE.
 
           Since the input and output ranges may vary depending on
@@ -2640,7 +2640,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           order of P_IN. For example, if the array is: [0.0, 0.0,
           0.3, 0.5, 1.0, 1.0], then the input-&gt;output mapping
           for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
-          0.25, 0.3 -&gt; 0.5, 0.5 -&gt; 0.64</notes>
+          0.25, 0.3 -&gt; 0.5, 0.5 -&gt; 0.64</details>
           <tag id="DNG" />
         </entry>
         <entry name="mode" type="byte" visibility="public" enum="true">
@@ -2750,7 +2750,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description> Whether black-level compensation is locked
           to its current values, or is free to vary</description>
-          <notes>When set to ON, the values used for black-level
+          <details>When set to ON, the values used for black-level
           compensation must not change until the lock is set to
           OFF
 
@@ -2788,18 +2788,18 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           the analog gain has changed, which forces black levels to be
           recalculated), then the HAL is free to override this request (and it
           must report 'OFF' when this does happen) until the next time locking
-          is legal again.</notes>
+          is legal again.</details>
           <tag id="HAL2" />
         </entry>
       </controls>
       <dynamic>
         <clone entry="android.blackLevel.lock"
           kind="controls">
-          <notes>
+          <details>
             Whether the black level offset was locked for this frame.
             Should be ON if android.blackLevel.lock was ON in the capture request,
             unless a change in capture settings forced a black level reset.
-          </notes>
+          </details>
         </clone>
       </dynamic>
     </section>
diff --git a/camera/docs/metadata_properties.xsd b/camera/docs/metadata_properties.xsd
index 851dfd6..51a32ad 100644 (file)
--- a/camera/docs/metadata_properties.xsd
+++ b/camera/docs/metadata_properties.xsd
@@ -139,7 +139,10 @@
             <element name="range" type="string" maxOccurs="1"
                 minOccurs="0">
             </element>
-            <element name="notes" type="string" maxOccurs="1"
+            <element name="details" type="string" maxOccurs="1"
+                minOccurs="0">
+            </element>
+            <element name="hal_details" type="string" maxOccurs="1"
                 minOccurs="0">
             </element>
 
diff --git a/camera/docs/metadata_template.mako b/camera/docs/metadata_template.mako
index da15103..dfe2bae 100644 (file)
--- a/camera/docs/metadata_template.mako
+++ b/camera/docs/metadata_template.mako
@@ -71,8 +71,12 @@
         % if prop.is_clone():
             <clone entry="${prop.name}" kind="${prop.target_kind}">
 
-              % if prop.notes is not None:
-                <notes>${prop.notes}</notes>
+              % if prop.details is not None:
+                <details>${prop.details}</details>
+              % endif
+
+              % if prop.hal_details is not None:
+                <hal_details>${prop.hal_details}</hal_details>
               % endif
 
               % for tag in prop.tags:
@@ -147,8 +151,12 @@
                 <range>${prop.range | x}</range>
               % endif
 
-              % if prop.notes is not None:
-                <notes>${prop.notes | x}</notes>
+              % if prop.details is not None:
+                <details>${prop.details | x}</details>
+              % endif
+
+              % if prop.hal_details is not None:
+                <hal_details>${prop.hal_details | x}</hal_details>
               % endif
 
               % for tag in prop.tags:
system/media
About OSDN
Find Software
Develop Software
Help