Merge "Camera: Overrides the focus mode for ZSL"

1 files changed, 14 insertions, 0 deletions

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 9558944c0..77cfcc5f8 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -91,6 +91,7 @@ public class FocusOverlayManager {
     private boolean mPreviousMoving;
     private boolean mFocusDefault;
     private boolean mZslEnabled = false;  //QCom Parameter to disable focus for ZSL
+    private boolean mTouchAFRunning = false;
 
     private FocusUI mUI;
     private final Rect mPreviewRect = new Rect(0, 0, 0, 0);
@@ -381,6 +382,10 @@ public class FocusOverlayManager {
         // Use margin to set the focus indicator to the touched area.
         mUI.setFocusPosition(x, y);
 
+        if (mZslEnabled) {
+            mTouchAFRunning = true;
+        }
+
         // Stop face detection because we want to specify focus and metering area.
         mListener.stopFaceDetection();
 
@@ -533,6 +538,10 @@ public class FocusOverlayManager {
             resetMeteringAreas();
         }
         mFocusDefault = true;
+        if (mTouchAFRunning && mZslEnabled) {
+            mTouchAFRunning = false;
+            mListener.setFocusParameters();
+        }
     }
 
     private void calculateTapArea(int x, int y, float areaMultiple, Rect rect) {
@@ -599,4 +608,9 @@ public class FocusOverlayManager {
     public boolean isZslEnabled() {
         return mZslEnabled;
     }
+
+    public boolean isTouch() {
+        return mTouchAFRunning;
+    }
+
 }