commit a7a50a45c75585e350eb730574b1e531468e8b18
author Wu-cheng Li <wuchengli@google.com> Wed Oct 05 18:29:26 2011 +0800
committer Wu-cheng Li <wuchengli@google.com> Wed Oct 05 18:49:36 2011 +0800
tree 807a8a3df0ed29468d54ccf958f5d1bb1baf1f41
parent 2aa8185ae2efbafd7e4efd65fdf798819058c600

Always show gray focus indicator in continuous autofocus mode.

+ Do not play focus sound in CAF.

Now CAF does not do a full scan. It returns failure most of
the time. It is strange to show red indicator.

bug:5219431

Change-Id: Ie914180e7132f29c8365dcccf810a7787bbf0d54

src/com/android/camera/FocusManager.java

diff --git a/src/com/android/camera/FocusManager.java b/src/com/android/camera/FocusManager.java
index 2ab37ad..f1b26fb 100644
--- a/src/com/android/camera/FocusManager.java
+++ b/src/com/android/camera/FocusManager.java
@@ -187,7 +187,11 @@
             // take the picture now.
             if (focused) {
                 mState = STATE_SUCCESS;
-                if (mFocusToneGenerator != null) {
+                // Do not play the sound in continuous autofocus mode. It does
+                // not do a full scan. The focus callback arrives before doSnap
+                // so the state is always STATE_FOCUSING.
+                if (!Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusMode)
+                        && mFocusToneGenerator != null) {
                     mFocusToneGenerator.startTone(ToneGenerator.TONE_PROP_BEEP2);
                 }
             } else {
@@ -386,10 +390,17 @@
             }
         } else if (mState == STATE_FOCUSING || mState == STATE_FOCUSING_SNAP_ON_FINISH) {
             focusIndicator.showStart();
-        } else if (mState == STATE_SUCCESS) {
-            focusIndicator.showSuccess();
-        } else if (mState == STATE_FAIL) {
-            focusIndicator.showFail();
+        } else {
+            // In CAF, do not show success or failure because it only returns
+            // the focus status. It does not do a full scan. So the result is
+            // failure most of the time.
+            if (Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusMode)) {
+                focusIndicator.showStart();
+            } else if (mState == STATE_SUCCESS) {
+                focusIndicator.showSuccess();
+            } else if (mState == STATE_FAIL) {
+                focusIndicator.showFail();
+            }
         }
     }