commit 120eea4e2f2824f4b01376b3cc10c030d6c0834a
author Ruben Brunk <rubenbrunk@google.com> Wed Jan 15 15:55:08 2014 -0800
committer Ruben Brunk <rubenbrunk@google.com> Tue Feb 04 10:12:18 2014 -0800
tree 8d9e92527797be8f5e30baa69dae4f222e54a48e
parent 74a97c610144792ad5174161058a434cf714026e

camera3: Update maxRegions tag.

Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01

camera/docs/docs.html

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 454dd58..f01210e 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -3132,22 +3132,31 @@
             </td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
+                <span class="entry_type_container">x</span>
 
+                <span class="entry_type_array">
+                  3
+                </span>
               <span class="entry_type_visibility"> [public]</span>
 
 
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <p>For AE,<wbr/> AWB,<wbr/> and AF,<wbr/> how many individual
-regions can be listed for metering?</p>
+              <p>List of the maximum number of regions that can be used for metering in
+auto-exposure (AE),<wbr/> auto-white balance (AWB),<wbr/> and auto-focus (AF);
+this corresponds to the the maximum number of elements in
+<a href="#controls_android.control.aeRegions">android.<wbr/>control.<wbr/>ae<wbr/>Regions</a>,<wbr/> <a href="#controls_android.control.awbRegions">android.<wbr/>control.<wbr/>awb<wbr/>Regions</a>,<wbr/>
+and <a href="#controls_android.control.afRegions">android.<wbr/>control.<wbr/>af<wbr/>Regions</a>.<wbr/></p>
             </td>
 
             <td class="entry_units">
             </td>
 
             <td class="entry_range">
-              <p>&gt;= 1</p>
+              <p>Value must be &gt;= 0 for each element.<wbr/> For full-capability devices
+this value must be &gt;= 1 for AE and AF.<wbr/> The order of the elements is:
+<code>(AE,<wbr/> AWB,<wbr/> AF)</code>.<wbr/></p>
             </td>
 
             <td class="entry_tags">

camera/docs/metadata_properties.xml

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 4be8e16..e466080 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -1222,10 +1222,21 @@
           </details>
           <tag id="BC" />
         </entry>
-        <entry name="maxRegions" type="int32" visibility="public">
-          <description>For AE, AWB, and AF, how many individual
-          regions can be listed for metering?</description>
-          <range>&amp;gt;= 1</range>
+        <entry name="maxRegions" type="int32" visibility="public" container="array">
+          <array>
+            <size>3</size>
+          </array>
+          <description>
+          List of the maximum number of regions that can be used for metering in
+          auto-exposure (AE), auto-white balance (AWB), and auto-focus (AF);
+          this corresponds to the the maximum number of elements in
+          android.control.aeRegions, android.control.awbRegions,
+          and android.control.afRegions.
+          </description>
+          <range>
+          Value must be &amp;gt;= 0 for each element. For full-capability devices
+          this value must be &amp;gt;= 1 for AE and AF. The order of the elements is:
+          `(AE, AWB, AF)`.</range>
           <tag id="BC" />
         </entry>
         <entry name="sceneModeOverrides" type="byte" visibility="system"