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, 7 insertions, 2 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 0f4d3b74a..a82abb9a8 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -95,7 +95,6 @@ public class PhotoMenu extends PieController
                 CameraSettings.KEY_RECORD_LOCATION,
                 CameraSettings.KEY_PICTURE_SIZE,
                 CameraSettings.KEY_HISTOGRAM,
-                CameraSettings.KEY_FOCUS_MODE,
                 CameraSettings.KEY_PICTURE_FORMAT,
                 CameraSettings.KEY_JPEG_QUALITY,
                 CameraSettings.KEY_ZSL,
@@ -122,6 +121,7 @@ public class PhotoMenu extends PieController
                 CameraSettings.KEY_EXPOSURE,
                 CameraSettings.KEY_WHITE_BALANCE,
                 CameraSettings.KEY_FLASH_MODE,
+                CameraSettings.KEY_FOCUS_MODE,
                 CameraSettings.KEY_REDEYE_REDUCTION,
                 CameraSettings.KEY_AE_BRACKET_HDR
         };
@@ -243,14 +243,19 @@ public class PhotoMenu extends PieController
      String sceneMode = (pref != null) ? pref.getValue() : null;
      pref = mPreferenceGroup.findPreference(CameraSettings.KEY_FACE_DETECTION);
      String faceDetection = (pref != null) ? pref.getValue() : null;
+     pref = mPreferenceGroup.findPreference(CameraSettings.KEY_ZSL);
+     String zsl = (pref != null) ? pref.getValue() : null;
      if ((sceneMode != null) && !Parameters.SCENE_MODE_AUTO.equals(sceneMode)){
-         popup1.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false);
+         popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false);
          popup2.setPreferenceEnabled(CameraSettings.KEY_AUTOEXPOSURE,false);
          popup2.setPreferenceEnabled(CameraSettings.KEY_TOUCH_AF_AEC,false);
          popup3.setPreferenceEnabled(CameraSettings.KEY_FLASH_MODE,false);
          popup3.setPreferenceEnabled(CameraSettings.KEY_WHITE_BALANCE,false);
          popup3.setPreferenceEnabled(CameraSettings.KEY_EXPOSURE,false);
      }
+     if ((zsl != null) && Parameters.ZSL_ON.equals(zsl)) {
+         popup3.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE,false);
+     }
      if ((faceDetection != null) && !Parameters.FACE_DETECTION_ON.equals(faceDetection)){
          popup2.setPreferenceEnabled(CameraSettings.KEY_FACE_RECOGNITION,false);
      }