Fix preview stop when longshot

take ZSL picture
don't stopreeating when shutter button up

Change-Id: I7325e30c6a98fb3c15970a987f89f9ab2d824bec

3 files changed, 27 insertions, 16 deletions

diff --git a/assets/dependency.json b/assets/dependency.json
index 8a86d11cd..650b0efbf 100644
--- a/assets/dependency.json
+++ b/assets/dependency.json
@@ -54,13 +54,15 @@
       {"pref_camera2_coloreffect_key":"0"}
     ,
     "102":
-    {"pref_camera2_coloreffect_key":"0"}
+    {"pref_camera2_coloreffect_key":"0",
+      "pref_camera2_longshot_key":"off"}
     ,
     "101":
     {"pref_camera2_coloreffect_key":"0"}
    ,
     "3":
-    {"pref_camera2_coloreffect_key":"0"}
+    {"pref_camera2_coloreffect_key":"0",
+      "pref_camera2_longshot_key":"off"}
     ,
     "4":
     {"pref_camera2_coloreffect_key":"0"}
@@ -75,7 +77,8 @@
     {"pref_camera2_coloreffect_key":"0"}
     ,
     "5":
-    {"pref_camera2_coloreffect_key":"0"}
+    {"pref_camera2_coloreffect_key":"0",
+      "pref_camera2_longshot_key":"off"}
     ,
     "8":
     {"pref_camera2_coloreffect_key":"0"}
@@ -95,13 +98,16 @@
       "pref_camera2_longshot_key":"off"}
     ,
     "106":
-    {"pref_camera2_coloreffect_key":"0"}
+    {"pref_camera2_coloreffect_key":"0",
+      "pref_camera2_longshot_key":"off"}
     ,
     "107":
-    {"pref_camera2_coloreffect_key":"0"}
+    {"pref_camera2_coloreffect_key":"0",
+      "pref_camera2_longshot_key":"off"}
     ,
     "108":
-    {"pref_camera2_coloreffect_key":"0"}
+    {"pref_camera2_coloreffect_key":"0",
+      "pref_camera2_longshot_key":"off"}
     ,
     "109":
     {"pref_camera2_coloreffect_key":"0"}
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 1f5339b43..5f8cd45d7 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1524,7 +1524,11 @@ public class CaptureModule implements CameraModule, PhotoController,
                         if (mUI.getCurrentProMode() == ProMode.MANUAL_MODE) {
                             captureStillPicture(BAYER_ID);
                         } else {
-                            lockFocus(BAYER_ID);
+                            if (mLongshotActive) {
+                                parallelLockFocusExposure(BAYER_ID);
+                            } else {
+                                lockFocus(BAYER_ID);
+                            }
                         }
                         break;
                     case MONO_MODE:
@@ -3430,13 +3434,6 @@ public class CaptureModule implements CameraModule, PhotoController,
             Log.d(TAG, "Longshot button up");
             mLongshotActive = false;
             mPostProcessor.stopLongShot();
-            try {
-                int id = getMainCameraId();
-                mCaptureSession[id].stopRepeating();
-                mCaptureSession[id].abortCaptures();
-            } catch (CameraAccessException e) {
-                Log.w(TAG, "Burst Session is already closed");
-            }
         }
     }
 
@@ -4562,7 +4559,9 @@ public class CaptureModule implements CameraModule, PhotoController,
 
             Log.d(TAG, "Start Longshot");
             mLongshotActive = true;
-            parallelLockFocusExposure(getMainCameraId());
+            takePicture();
+        } else {
+            RotateTextToast.makeText(mActivity, "Long shot not support", Toast.LENGTH_SHORT).show();
         }
     }
 
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index c75f31809..ebc9a697a 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -103,6 +103,8 @@ public class SettingsManager implements ListMenu.SettingsListener {
     public static final int SCENE_MODE_DEEPZOOM_INT = SCENE_MODE_CUSTOM_START + 10;
 	public static final int SCENE_MODE_DEEPPORTRAIT_INT = SCENE_MODE_CUSTOM_START + 11;
     public static final String SCENE_MODE_DUAL_STRING = "100";
+    public static final String SCENE_MODE_SUNSET_STRING = "10";
+    public static final String SCENE_MODE_LANDSCAPE_STRING = "4";
     public static final String KEY_CAMERA_SAVEPATH = "pref_camera2_savepath_key";
     public static final String KEY_RECORD_LOCATION = "pref_camera2_recordlocation_key";
     public static final String KEY_JPEG_QUALITY = "pref_camera2_jpegquality_key";
@@ -1647,7 +1649,11 @@ public class SettingsManager implements ListMenu.SettingsListener {
     public boolean isZSLInAppEnabled(){
         String value = getValue(KEY_ZSL);
         String appZSLValue = mContext.getString(R.string.pref_camera2_zsl_entryvalue_app_zsl);
-        if ( value != null && value.equals(appZSLValue) ){
+        if ( (value != null && value.equals(appZSLValue)) ||
+                SettingsManager.SCENE_MODE_SUNSET_STRING.equals(
+                        SettingsManager.getInstance().getValue(SettingsManager.KEY_SCENE_MODE)) ||
+                SettingsManager.SCENE_MODE_LANDSCAPE_STRING.equals(
+                        SettingsManager.getInstance().getValue(SettingsManager.KEY_SCENE_MODE))){
             return true;
         }else{
             return false;