Camera: Remove AF UI when faces are detected in photo ui

 AF window does not go away when faces are detected while
 capturing the images.This is because AF is not cleared
 when faces are detected in photo ui.

 The fix is to clear AF window by calling AF succeed
 when faces are detected in photo ui.

 CRs-Fixed: 555139

Change-Id: If0f10296a8fa232829e80a07778f78f158a55bf5

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 77cfcc5f8..86b5966cf 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -92,6 +92,7 @@ public class FocusOverlayManager {
     private boolean mFocusDefault;
     private boolean mZslEnabled = false;  //QCom Parameter to disable focus for ZSL
     private boolean mTouchAFRunning = false;
+    private boolean mIsAFRunning = false;
 
     private FocusUI mUI;
     private final Rect mPreviewRect = new Rect(0, 0, 0, 0);
@@ -313,6 +314,10 @@ public class FocusOverlayManager {
         // Ignore if the camera has detected some faces.
         if (mUI.hasFaces()) {
             mUI.clearFocus();
+            if (mIsAFRunning) {
+                mUI.onFocusSucceeded(true);
+                mIsAFRunning = false;
+            }
             return;
         }
 
@@ -323,8 +328,10 @@ public class FocusOverlayManager {
         // animate on false->true trasition only b/8219520
         if (moving && !mPreviousMoving) {
             mUI.onFocusStarted();
+            mIsAFRunning = true;
         } else if (!moving) {
             mUI.onFocusSucceeded(true);
+            mIsAFRunning = false;
         }
         mPreviousMoving = moving;
     }