Merge "Lock focus during countdown" into gb-ub-photos-bryce

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() {