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 422fb21b0..da52d90e1 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -43,6 +43,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> + <!-- Set's manufacturer specific parameters on startup. Example: lge-camera=1;cam-mode=0 --> <string name="manufacturer_key_values"></string> diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 18a315fd0..98f8dcfb3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1482,18 +1482,23 @@ public class PhotoModule boolean backCameraRestartPreviewOnPictureTaken = false; boolean frontCameraRestartPreviewOnPictureTaken = false; + boolean additionalCameraRestartPreviewOnPictureTaken = false; if (mApplicationContext != null) { backCameraRestartPreviewOnPictureTaken = mApplicationContext.getResources().getBoolean(R.bool.back_camera_restart_preview_onPictureTaken); frontCameraRestartPreviewOnPictureTaken = mApplicationContext.getResources().getBoolean(R.bool.front_camera_restart_preview_onPictureTaken); + additionalCameraRestartPreviewOnPictureTaken = + mApplicationContext.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; } |