diff options
author | LuK1337 <priv.luk@gmail.com> | 2017-03-19 10:43:33 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-27 00:41:41 +0100 |
commit | 57748cb5f97a73277ca9cb2e7b2f7722311616ad (patch) | |
tree | 3f5859d3f62d219a59fafedaa8b3dd18cb55b20e /src/com/android/camera/PhotoModule.java | |
parent | 9b13a1742199bf2ce392537c2224974b5dcd8b77 (diff) | |
download | android_packages_apps_Snap-57748cb5f97a73277ca9cb2e7b2f7722311616ad.tar.gz android_packages_apps_Snap-57748cb5f97a73277ca9cb2e7b2f7722311616ad.tar.bz2 android_packages_apps_Snap-57748cb5f97a73277ca9cb2e7b2f7722311616ad.zip |
Add overlay for restarting camera preview for additional cameras
Change-Id: I95eb7237b101b73d66fe231a11d0c8d5156bfe47
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
1 files changed, 6 insertions, 1 deletions
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; } |