From da50e05c6f01a8de71e6c3e7293058b4f6985316 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Thu, 7 Feb 2013 14:36:32 -0800
Subject: Lock focus during countdown

Change-Id: Ia8d4250daa488c35e276218e9fdb8efdf00836c2
---
 src/com/android/camera/PhotoModule.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/com/android/camera')

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() {
-- 
cgit v1.2.3