diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-10-13 17:03:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 17:03:32 -0700 |
| commit | 68b42c6483dfdde2ba899ba09f2122b0c2a5d556 (patch) | |
| tree | 7bb7640d4979efc2a2edb07bb72ed74266102d2e | |
| parent | 987e9b4e1849f2a3eab840de472e15ccde21d262 (diff) | |
| parent | 323d012feff1265ee67e0051605c030fa4187a5d (diff) | |
| download | LegacyCamera-68b42c6483dfdde2ba899ba09f2122b0c2a5d556.zip LegacyCamera-68b42c6483dfdde2ba899ba09f2122b0c2a5d556.tar.gz LegacyCamera-68b42c6483dfdde2ba899ba09f2122b0c2a5d556.tar.bz2 | |
am 323d012f: am 1f33b0ca: Merge "Do not call autoFocus in fixed and EDOF focus modes." into gingerbread
Merge commit '323d012feff1265ee67e0051605c030fa4187a5d'
* commit '323d012feff1265ee67e0051605c030fa4187a5d':
Do not call autoFocus in fixed and EDOF focus modes.
| -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. |