diff options
| author | Doris Liu <tianliu@google.com> | 2013-02-11 21:39:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-11 21:39:41 +0000 |
| commit | cef56e96ff49a90d032699ed06b9991fc8486d2a (patch) | |
| tree | eedd9068de552dff2aec1b9c5f857995ab060b06 /src | |
| parent | 3f1665337123cbc5a21f7b424c224dc39c0f0d37 (diff) | |
| parent | da50e05c6f01a8de71e6c3e7293058b4f6985316 (diff) | |
| download | android_packages_apps_Snap-cef56e96ff49a90d032699ed06b9991fc8486d2a.tar.gz android_packages_apps_Snap-cef56e96ff49a90d032699ed06b9991fc8486d2a.tar.bz2 android_packages_apps_Snap-cef56e96ff49a90d032699ed06b9991fc8486d2a.zip | |
Merge "Lock focus during countdown" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ec6dcab3d..60cb67896 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1437,7 +1437,11 @@ public class PhotoModule } mFocusManager.onShutterDown(); } else { - mFocusManager.onShutterUp(); + // for countdown mode, we need to postpone the shutter release + // i.e. lock the focus during countdown. + if (!mCountDownView.isCountingDown()) { + mFocusManager.onShutterUp(); + } } } @@ -2429,6 +2433,7 @@ public class PhotoModule public void onCountDownFinished() { mSnapshotOnIdle = false; mFocusManager.doSnap(); + mFocusManager.onShutterUp(); } void setPreviewFrameLayoutAspectRatio() { |