SnapdragonCamera: Set the max pictureSize in deepzoom mode

Set the max pictureSize in deepzoom mode, and disable the
pictureSize menu.

CRs-Fixed: 2185479
Change-Id: Ibba3ccabd30d4ab4c0eb18b94caa1062c3349456

2 files changed, 13 insertions, 9 deletions

diff --git a/assets/dependency.json b/assets/dependency.json
index 7a76559d2..8a86d11cd 100644
--- a/assets/dependency.json
+++ b/assets/dependency.json
@@ -108,7 +108,8 @@
     ,
     "110":
     {"pref_camera2_coloreffect_key":"0",
-      "pref_camera2_longshot_key":"off"}
+      "pref_camera2_longshot_key":"off",
+      "pref_camera2_picturesize_key":"3840x2160"}
   },
   "pref_camera2_clearsight_key":
   {
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 0fda7e213..905804578 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2767,17 +2767,20 @@ public class CaptureModule implements CameraModule, PhotoController,
             }
 
             mSaveRaw = isRawCaptureOn();
+            int filterMode = PostProcessor.FILTER_NONE;
             if (scene != null) {
                 int mode = Integer.parseInt(scene);
-                Log.d(TAG, "Chosen postproc filter id : " + getPostProcFilterId(mode));
-                mPostProcessor.onOpen(getPostProcFilterId(mode), isFlashOn,
-                        isTrackingFocusSettingOn(), isMakeupOn, isSelfieMirrorOn,
-                        mSaveRaw, mIsSupportedQcfa, mDeepPortraitMode);
-            } else {
-                mPostProcessor.onOpen(PostProcessor.FILTER_NONE, isFlashOn,
-                        isTrackingFocusSettingOn(), isMakeupOn, isSelfieMirrorOn,
-                        mSaveRaw, mIsSupportedQcfa, mDeepPortraitMode);
+                filterMode = getPostProcFilterId(mode);
+                Log.d(TAG, "Chosen postproc filter id : " + filterMode);
+                if (mode == SettingsManager.SCENE_MODE_DEEPZOOM_INT) {
+                    String maxSize = mSettingsManager.getEntryValues(
+                            SettingsManager.KEY_PICTURE_SIZE)[0].toString();
+                    mSettingsManager.setValue(SettingsManager.KEY_PICTURE_SIZE, maxSize);
+                }
             }
+            mPostProcessor.onOpen(filterMode, isFlashOn,
+                    isTrackingFocusSettingOn(), isMakeupOn, isSelfieMirrorOn,
+                    mSaveRaw, mIsSupportedQcfa, mDeepPortraitMode);
         }
         if(mFrameProcessor != null) {
             mFrameProcessor.onOpen(getFrameProcFilterId(), mPreviewSize);