Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix javadoc of camera focus distances API." into kraken

Browse Source
This commit is contained in:
Wu-cheng Li
2010-05-20 01:46:51 -07:00
committed by Android (Google) Code Review
parent a6638606c2 185cc455a8
commit 5badcabadb
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/hardware/Camera.java
View File

@@ -1845,21 +1845,19 @@ public class Camera {
* #autoFocus(AutoFocusCallback)}, {@link #cancelAutoFocus}, or {@link * #autoFocus(AutoFocusCallback)}, {@link #cancelAutoFocus}, or {@link
* #startPreview()}. Applications can call {@link #getParameters()} * #startPreview()}. Applications can call {@link #getParameters()}
* and this method anytime to get the latest focus distances. If the * and this method anytime to get the latest focus distances. If the
* focus mode is FOCUS_MODE_EDOF, the values may be all 0, which means * focus mode is FOCUS_MODE_CONTINUOUS and autofocus has started, focus
* focus distance is not applicable. If the focus mode is * distances may change from time to time.
* FOCUS_MODE_CONTINUOUS and autofocus has started, focus distances may
* change from time to time.
* *
* Far focus distance > optimal focus distance > near focus distance. If * Far focus distance >= optimal focus distance >= near focus distance.
* the far focus distance is infinity, the value will be * If the focus distance is infinity, the value will be
* Float.POSITIVE_INFINITY. * Float.POSITIVE_INFINITY.
* *
* @param output focus distances in meters. output must be a float * @param output focus distances in meters. output must be a float
* array with three elements. Near focus distance, optimal focus * array with three elements. Near focus distance, optimal focus
* distance, and far focus distance will be filled in the array. * distance, and far focus distance will be filled in the array.
* @see #NEAR_FOCUS_DISTANCE_INDEX * @see #FOCUS_DISTANCE_NEAR_INDEX
* @see #OPTIMAL_FOCUS_DISTANCE_INDEX * @see #FOCUS_DISTANCE_OPTIMAL_INDEX
* @see #FAR_FOCUS_DISTANCE_INDEX * @see #FOCUS_DISTANCE_FAR_INDEX
*/ */
public void getFocusDistances(float[] output) { public void getFocusDistances(float[] output) {
if (output == null || output.length != 3) { if (output == null || output.length != 3) {