Camera: Overrides the focus mode for ZSL

 - This modification will override the currently
  configured focus mode to CAF( if supported ) in
  case we switch to ZSL mode. In addition to that
  the client will not be able to change the focus
  mode once ZSL is active.
- TouchAF will be available in ZSL mode if supported.
- Moves focus option to the rest of the 3A modes.

Change-Id: I4a2ab7d6013c26365cf46e7b3c5d2d0d3afd574e
CRs-fixed: 522500,528835,585670

1 files changed, 14 insertions, 0 deletions

diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 37d632745..632301183 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -92,6 +92,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;
 
@@ -367,6 +368,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();
 
@@ -519,6 +524,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) {
@@ -583,4 +592,9 @@ public class FocusOverlayManager {
     public boolean isZslEnabled() {
         return mZslEnabled;
     }
+
+    public boolean isTouch() {
+        return mTouchAFRunning;
+    }
+
 }