From: Zhijun He <zhijunhe@google.com>
Date: Tue, 14 Jan 2014 17:59:04 +0000 (-0800)
Subject: camera_metadata: Update afAvailableModes tag
X-Git-Tag: android-x86-7.1-r1~429
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f163fa91a5ca5b6a8efceb67c60d515145187101;p=android-x86%2Fsystem-media.git

camera_metadata: Update afAvailableModes tag

Change-Id: I7301021a78c45f76ce2b133663552648712e78e8
---

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 30eac353..93d2f950 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -1681,9 +1681,9 @@ mode it is set to</p>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
               <p>Only effective if <a href="#controls_android.control.mode">android.<wbr/>control.<wbr/>mode</a> = AUTO.<wbr/></p>
-<p>If lens is controlled by HAL auto-focus algorithm,<wbr/> the HAL should
-report the current AF status in <a href="#dynamic_android.control.afState">android.<wbr/>control.<wbr/>af<wbr/>State</a> in
-result metadata.<wbr/></p>
+<p>If the lens is controlled by the camera device auto-focus algorithm,<wbr/>
+the camera device will report the current AF status in android.<wbr/>control.<wbr/>af<wbr/>State
+in result metadata.<wbr/></p>
             </td>
           </tr>
 
@@ -2673,7 +2673,7 @@ can be changed</p>
         
                 
           <tr class="entry" id="static_android.control.afAvailableModes">
-            <td class="entry_name" rowspan="1">
+            <td class="entry_name" rowspan="3">
               android.<wbr/>control.<wbr/>af<wbr/>Available<wbr/>Modes
             </td>
             <td class="entry_type">
@@ -2691,15 +2691,13 @@ can be changed</p>
 
             <td class="entry_description">
               <p>List of AF modes that can be
-selected</p>
+selected with <a href="#controls_android.control.afMode">android.<wbr/>control.<wbr/>af<wbr/>Mode</a>.<wbr/></p>
             </td>
 
             <td class="entry_units">
             </td>
 
             <td class="entry_range">
-              <p>OFF must be included.<wbr/> AUTO must be supported if
-lens allows for changing focus</p>
             </td>
 
             <td class="entry_tags">
@@ -2709,6 +2707,19 @@ lens allows for changing focus</p>
             </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">
+              <p>Not all the auto-focus modes may be supported by a
+given camera device.<wbr/> This entry lists the valid modes for
+<a href="#controls_android.control.afMode">android.<wbr/>control.<wbr/>af<wbr/>Mode</a> for this camera device.<wbr/></p>
+<p>All camera devices will support OFF mode,<wbr/> and all camera devices with
+adjustable focuser units (<code><a href="#static_android.lens.info.minimumFocusDistance">android.<wbr/>lens.<wbr/>info.<wbr/>minimum<wbr/>Focus<wbr/>Distance</a> &gt; 0</code>)
+will support AUTO mode.<wbr/></p>
+            </td>
+          </tr>
 
 
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
@@ -3439,9 +3450,9 @@ mode it is set to</p>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
               <p>Only effective if <a href="#controls_android.control.mode">android.<wbr/>control.<wbr/>mode</a> = AUTO.<wbr/></p>
-<p>If lens is controlled by HAL auto-focus algorithm,<wbr/> the HAL should
-report the current AF status in <a href="#dynamic_android.control.afState">android.<wbr/>control.<wbr/>af<wbr/>State</a> in
-result metadata.<wbr/></p>
+<p>If the lens is controlled by the camera device auto-focus algorithm,<wbr/>
+the camera device will report the current AF status in android.<wbr/>control.<wbr/>af<wbr/>State
+in result metadata.<wbr/></p>
             </td>
           </tr>
 
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index bd7cc2da..1506d4cc 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -471,9 +471,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           mode it is set to</description>
           <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.</details>
+          If the lens is controlled by the camera device auto-focus algorithm,
+          the camera device will report the current AF status in android.control.afState
+          in result metadata.</details>
           <tag id="BC" />
         </entry>
         <entry name="afRegions" type="int32" visibility="public"
@@ -805,9 +805,16 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             <size>n</size>
           </array>
           <description>List of AF modes that can be
-          selected</description>
-          <range>OFF must be included. AUTO must be supported if
-          lens allows for changing focus</range>
+          selected with android.control.afMode.</description>
+          <details>
+          Not all the auto-focus modes may be supported by a
+          given camera device. This entry lists the valid modes for
+          android.control.afMode for this camera device.
+
+          All camera devices will support OFF mode, and all camera devices with
+          adjustable focuser units (`android.lens.info.minimumFocusDistance &gt; 0`)
+          will support AUTO mode.
+          </details>
           <tag id="BC" />
         </entry>
         <entry name="availableEffects" type="byte" visibility="public"