camera_metadata: Fix inconsistencies in digital zoom reporting
Bug: 8840802
Change-Id: I195aa3b3ea8a60a7f737ec9abcae676a2d6c1e4f
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 6fdf265..9e9cafd 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -265,7 +265,6 @@
<li><a href="#static_android.scaler.availableProcessedSizes">android.scaler.availableProcessedSizes</a> (static)</li>
<li><a href="#static_android.scaler.availableRawMinDurations">android.scaler.availableRawMinDurations</a> (static)</li>
<li><a href="#static_android.scaler.availableRawSizes">android.scaler.availableRawSizes</a> (static)</li>
- <li><a href="#static_android.scaler.maxDigitalZoom">android.scaler.maxDigitalZoom</a> (static)</li>
<li><a href="#dynamic_android.scaler.cropRegion">android.scaler.cropRegion</a> (dynamic)</li>
</ul>
</li> <!-- toc_section -->
@@ -6900,7 +6899,7 @@
<tr class="entry" id="static_android.scaler.availableMaxDigitalZoom">
<td class="entry_name">android.<wbr>scaler.<wbr>available<wbr>Max<wbr>Digital<wbr>Zoom</td>
<td class="entry_type">
- <span class="entry_type_name">int32</span>
+ <span class="entry_type_name">float</span>
@@ -6908,19 +6907,26 @@
</td> <!-- entry_type -->
<td class="entry_description">
- TODO: have a real description here
+ The maximum ratio between active area width
+ and crop region width,<wbr> or between active area height and
+ crop region height,<wbr> if the crop region height is larger
+ than width
</td>
<td class="entry_units">
</td>
<td class="entry_range">
+ >=1
</td>
<td class="entry_notes">
</td>
<td class="entry_tags">
+ <ul class="entry_tags">
+ <li><a href="#tag_BC">BC</a></li>
+ </ul>
</td>
</tr> <!-- end of entry -->
@@ -7088,42 +7094,6 @@
</tr> <!-- end of entry -->
-
- <tr class="entry" id="static_android.scaler.maxDigitalZoom">
- <td class="entry_name">android.<wbr>scaler.<wbr>max<wbr>Digital<wbr>Zoom</td>
- <td class="entry_type">
- <span class="entry_type_name">float</span>
-
-
-
-
- </td> <!-- entry_type -->
-
- <td class="entry_description">
- The maximum ratio between active area width
- and crop region width,<wbr> or between active area height and
- crop region height,<wbr> if the crop region height is larger
- than width
- </td>
-
- <td class="entry_units">
- </td>
-
- <td class="entry_range">
- >=1
- </td>
-
- <td class="entry_notes">
- </td>
-
- <td class="entry_tags">
- <ul class="entry_tags">
- <li><a href="#tag_BC">BC</a></li>
- </ul>
- </td>
-
- </tr> <!-- end of entry -->
-
<!-- end of kind -->
@@ -10167,10 +10137,10 @@
<li><a href="#static_android.scaler.availableFormats">android.scaler.availableFormats</a> (static)</li>
<li><a href="#static_android.scaler.availableJpegMinDurations">android.scaler.availableJpegMinDurations</a> (static)</li>
<li><a href="#static_android.scaler.availableJpegSizes">android.scaler.availableJpegSizes</a> (static)</li>
+ <li><a href="#static_android.scaler.availableMaxDigitalZoom">android.scaler.availableMaxDigitalZoom</a> (static)</li>
<li><a href="#static_android.scaler.availableProcessedMinDurations">android.scaler.availableProcessedMinDurations</a> (static)</li>
<li><a href="#static_android.scaler.availableProcessedSizes">android.scaler.availableProcessedSizes</a> (static)</li>
<li><a href="#static_android.scaler.availableRawMinDurations">android.scaler.availableRawMinDurations</a> (static)</li>
- <li><a href="#static_android.scaler.maxDigitalZoom">android.scaler.maxDigitalZoom</a> (static)</li>
<li><a href="#controls_android.sensor.frameDuration">android.sensor.frameDuration</a> (controls)</li>
<li><a href="#static_android.sensor.info.availableSensitivities">android.sensor.info.availableSensitivities</a> (static)</li>
<li><a href="#static_android.sensor.info.maxFrameDuration">android.sensor.info.maxFrameDuration</a> (static)</li>