summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-09-22 16:11:06 -0700
committerRuben Brunk <rubenbrunk@google.com>2014-09-22 16:11:06 -0700
commita5bcb401f154ddf05017ee13d6ae7e4774fd3107 (patch)
treeb792e5a28bd0e78c245b45fbf21567834ebbc737
parent425bf818f27d2ee92b73c8f0d7d375d88d28dd68 (diff)
downloadandroid_system_media-a5bcb401f154ddf05017ee13d6ae7e4774fd3107.tar.gz
android_system_media-a5bcb401f154ddf05017ee13d6ae7e4774fd3107.tar.bz2
android_system_media-a5bcb401f154ddf05017ee13d6ae7e4774fd3107.zip
camera2: Docs update for available AF modes.
Bug: 17588783 Change-Id: If4010517e79b3a51bd6231424a10be672ff5a252
-rw-r--r--camera/docs/docs.html6
-rw-r--r--camera/docs/metadata_properties.xml6
2 files changed, 6 insertions, 6 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 1ff34ae1..773c4666 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -4034,9 +4034,9 @@ selected with <a href="#controls_android.control.afMode">android.<wbr/>control.<
<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>
+<p>All LIMITED and FULL mode 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>
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 9ef60911..29260e81 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -1615,9 +1615,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
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.
+ All LIMITED and FULL mode 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>