diff options
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index b77955f..aa620c3 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1632,6 +1632,8 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, // can take the photo right away. If the focus mode is infinity, we can // also take the photo. if (mFocusMode.equals(Parameters.FOCUS_MODE_INFINITY) + || mFocusMode.equals(Parameters.FOCUS_MODE_FIXED) + || mFocusMode.equals(Parameters.FOCUS_MODE_EDOF) || (mFocusState == FOCUS_SUCCESS || mFocusState == FOCUS_FAIL)) { mImageCapture.onSnap(); @@ -1648,7 +1650,9 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, private void doFocus(boolean pressed) { // Do the focus if the mode is not infinity. if (mHeadUpDisplay.collapse()) return; - if (!mFocusMode.equals(Parameters.FOCUS_MODE_INFINITY)) { + if (!(mFocusMode.equals(Parameters.FOCUS_MODE_INFINITY) + || mFocusMode.equals(Parameters.FOCUS_MODE_FIXED) + || mFocusMode.equals(Parameters.FOCUS_MODE_EDOF))) { if (pressed) { // Focus key down. autoFocus(); } else { // Focus key up. |