diff options
| -rw-r--r-- | res/values/config.xml | 3 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 26e64c32f..90c007ecb 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -47,6 +47,9 @@ <!-- Restart preview for front camera onPictureTaken --> <bool name="front_camera_restart_preview_onPictureTaken">false</bool> + <!-- Restart preview for additional camera onPictureTaken --> + <bool name="additional_camera_restart_preview_onPictureTaken">false</bool> + <!-- Force use a specific preview-size Example: 1920x1080 --> <string name="preview_size_for_photo"></string> diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index fb4db8c10..1f9529a31 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1382,16 +1382,21 @@ public class PhotoModule extends BaseModule<PhotoUI> implements boolean backCameraRestartPreviewOnPictureTaken = false; boolean frontCameraRestartPreviewOnPictureTaken = false; + boolean additionalCameraRestartPreviewOnPictureTaken = false; backCameraRestartPreviewOnPictureTaken = mActivity.getResources().getBoolean(R.bool.back_camera_restart_preview_onPictureTaken); frontCameraRestartPreviewOnPictureTaken = mActivity.getResources().getBoolean(R.bool.front_camera_restart_preview_onPictureTaken); + additionalCameraRestartPreviewOnPictureTaken = + mActivity.getResources().getBoolean(R.bool.additional_camera_restart_preview_onPictureTaken); CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId]; if ((info.facing == CameraInfo.CAMERA_FACING_BACK && backCameraRestartPreviewOnPictureTaken && (mCameraState != LONGSHOT)) || (info.facing == CameraInfo.CAMERA_FACING_FRONT - && frontCameraRestartPreviewOnPictureTaken && (mCameraState != LONGSHOT))) { + && frontCameraRestartPreviewOnPictureTaken && (mCameraState != LONGSHOT)) + || (info.facing > CameraInfo.CAMERA_FACING_FRONT + && additionalCameraRestartPreviewOnPictureTaken && (mCameraState != LONGSHOT))) { needRestartPreview = true; } |