camera3: Update optical stabilization tags.

Change-Id: Ic2bdec216c1685f2ea3036f9d027ea24679a8bfe

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 16cc369..334bcaa 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -7016,25 +7016,27 @@ to (0,<wbr/>minimum focus distance)</p>
                 <ul class="entry_type_enum">
                   <li>
                     <span class="entry_type_enum_name">OFF</span>
+                    <span class="entry_type_enum_notes"><p>Optical stabilization is unavailable.<wbr/></p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">ON</span>
                     <span class="entry_type_enum_optional">optional</span>
+                    <span class="entry_type_enum_notes"><p>Optical stabilization is enabled.<wbr/></p></span>
                   </li>
                 </ul>
 
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <p>Whether optical image stabilization is
-enabled.<wbr/></p>
+              <p>Sets whether the camera device uses optical image stabilization (OIS)
+when capturing images.<wbr/></p>
             </td>
 
             <td class="entry_units">
             </td>
 
             <td class="entry_range">
-              <p>android.<wbr/>lens.<wbr/>available<wbr/>Optical<wbr/>Stabilization</p>
+              <p><a href="#static_android.lens.info.availableOpticalStabilization">android.<wbr/>lens.<wbr/>info.<wbr/>available<wbr/>Optical<wbr/>Stabilization</a></p>
             </td>
 
             <td class="entry_tags">
@@ -7049,7 +7051,12 @@ enabled.<wbr/></p>
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>Will not be supported on most devices.<wbr/></p>
+              <p>OIS is used to compensate for motion blur due to small movements of
+the camera during capture.<wbr/> Unlike digital image stabilization,<wbr/> OIS makes
+use of mechanical elements to stabilize the camera sensor,<wbr/> and thus
+allows for longer exposure times before camera shake becomes
+apparent.<wbr/></p>
+<p>This is not expected to be supported on most devices.<wbr/></p>
             </td>
           </tr>
 
@@ -7247,7 +7254,7 @@ by the device.<wbr/></p>
         
                 
           <tr class="entry" id="static_android.lens.info.availableOpticalStabilization">
-            <td class="entry_name" rowspan="1">
+            <td class="entry_name" rowspan="3">
               android.<wbr/>lens.<wbr/>info.<wbr/>available<wbr/>Optical<wbr/>Stabilization
             </td>
             <td class="entry_type">
@@ -7264,8 +7271,9 @@ by the device.<wbr/></p>
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <p>List of supported optical image
-stabilization modes</p>
+              <p>List containing a subset of the optical image
+stabilization (OIS) modes specified in
+<a href="#controls_android.lens.opticalStabilizationMode">android.<wbr/>lens.<wbr/>optical<wbr/>Stabilization<wbr/>Mode</a>.<wbr/></p>
             </td>
 
             <td class="entry_units">
@@ -7281,6 +7289,15 @@ stabilization modes</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>If OIS is not implemented for a given camera device,<wbr/> this should
+contain only OFF.<wbr/></p>
+            </td>
+          </tr>
 
 
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
@@ -7976,25 +7993,27 @@ fixed depth of field range</p>
                 <ul class="entry_type_enum">
                   <li>
                     <span class="entry_type_enum_name">OFF</span>
+                    <span class="entry_type_enum_notes"><p>Optical stabilization is unavailable.<wbr/></p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">ON</span>
                     <span class="entry_type_enum_optional">optional</span>
+                    <span class="entry_type_enum_notes"><p>Optical stabilization is enabled.<wbr/></p></span>
                   </li>
                 </ul>
 
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <p>Whether optical image stabilization is
-enabled.<wbr/></p>
+              <p>Sets whether the camera device uses optical image stabilization (OIS)
+when capturing images.<wbr/></p>
             </td>
 
             <td class="entry_units">
             </td>
 
             <td class="entry_range">
-              <p>android.<wbr/>lens.<wbr/>available<wbr/>Optical<wbr/>Stabilization</p>
+              <p><a href="#static_android.lens.info.availableOpticalStabilization">android.<wbr/>lens.<wbr/>info.<wbr/>available<wbr/>Optical<wbr/>Stabilization</a></p>
             </td>
 
             <td class="entry_tags">
@@ -8009,7 +8028,12 @@ enabled.<wbr/></p>
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>Will not be supported on most devices.<wbr/></p>
+              <p>OIS is used to compensate for motion blur due to small movements of
+the camera during capture.<wbr/> Unlike digital image stabilization,<wbr/> OIS makes
+use of mechanical elements to stabilize the camera sensor,<wbr/> and thus
+allows for longer exposure times before camera shake becomes
+apparent.<wbr/></p>
+<p>This is not expected to be supported on most devices.<wbr/></p>
             </td>
           </tr>
 

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 045cf43..1fc1283 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -1877,13 +1877,27 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
         <entry name="opticalStabilizationMode" type="byte" visibility="public"
         enum="true">
           <enum>
-            <value>OFF</value>
-            <value optional="true">ON</value>
+            <value>OFF
+              <notes>Optical stabilization is unavailable.</notes>
+            </value>
+            <value optional="true">ON
+              <notes>Optical stabilization is enabled.</notes>
+            </value>
           </enum>
-          <description>Whether optical image stabilization is
-          enabled.</description>
-          <range>android.lens.availableOpticalStabilization</range>
-          <details>Will not be supported on most devices.</details>
+          <description>
+          Sets whether the camera device uses optical image stabilization (OIS)
+          when capturing images.
+          </description>
+          <range>android.lens.info.availableOpticalStabilization</range>
+          <details>
+          OIS is used to compensate for motion blur due to small movements of
+          the camera during capture. Unlike digital image stabilization, OIS makes
+          use of mechanical elements to stabilize the camera sensor, and thus
+          allows for longer exposure times before camera shake becomes
+          apparent.
+
+          This is not expected to be supported on most devices.
+          </details>
           <tag id="V1" />
         </entry>
       </controls>
@@ -1952,8 +1966,15 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             <array>
               <size>n</size>
             </array>
-            <description>List of supported optical image
-            stabilization modes</description>
+            <description>
+            List containing a subset of the optical image
+            stabilization (OIS) modes specified in
+            android.lens.opticalStabilizationMode.
+            </description>
+            <details>
+            If OIS is not implemented for a given camera device, this should
+            contain only OFF.
+            </details>
             <tag id="V1" />
           </entry>
           <entry name="geometricCorrectionMap" type="float"