diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-22 17:17:53 +0100 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-22 17:19:12 +0100 |
| commit | 20030981216ac68d992994244a16efbfc676330b (patch) | |
| tree | 85d83ede4c9195628aac403266f70279cb71ad32 /src/com | |
| parent | bb800ac9bf961b9e53ec56a1a5ababf31b9d40a1 (diff) | |
| download | android_packages_apps_Snap-20030981216ac68d992994244a16efbfc676330b.tar.gz android_packages_apps_Snap-20030981216ac68d992994244a16efbfc676330b.tar.bz2 android_packages_apps_Snap-20030981216ac68d992994244a16efbfc676330b.zip | |
Snap: do not restart preview during longshots
Change-Id: I6ad439dc0be7c6e0d13ac7c22aacdc0ad559d051
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 78fe8ee56..db12222c3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1172,7 +1172,7 @@ public class PhotoModule mParameters = mCameraDevice.getParameters(); mBurstSnapNum = CameraUtil.getNumSnapsPerShutter(mParameters); } - Log.v(TAG, "JpegPictureCallback: Received = " + mReceivedSnapNum + + Log.v(TAG, "JpegPictureCallback: Received = " + mReceivedSnapNum + " " + "Burst count = " + mBurstSnapNum); // If postview callback has arrived, the captured image is displayed // in postview callback. If not, the captured image is displayed in @@ -1204,26 +1204,27 @@ public class PhotoModule needRestartPreview |= ((mReceivedSnapNum == mBurstSnapNum) && !mFocusManager.isZslEnabled() && CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)); - needRestartPreview |= mLgeHdrMode; + needRestartPreview |= mLgeHdrMode && (mCameraState != LONGSHOT); boolean backCameraRestartPreviewOnPictureTaken = false; boolean frontCameraRestartPreviewOnPictureTaken = false; if (mApplicationContext != null) { - backCameraRestartPreviewOnPictureTaken = + backCameraRestartPreviewOnPictureTaken = mApplicationContext.getResources().getBoolean(R.bool.back_camera_restart_preview_onPictureTaken); - frontCameraRestartPreviewOnPictureTaken = + frontCameraRestartPreviewOnPictureTaken = mApplicationContext.getResources().getBoolean(R.bool.front_camera_restart_preview_onPictureTaken); } CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId]; - if ((info.facing == CameraInfo.CAMERA_FACING_BACK - && backCameraRestartPreviewOnPictureTaken) - || (info.facing == CameraInfo.CAMERA_FACING_FRONT - && frontCameraRestartPreviewOnPictureTaken)) { + if ((info.facing == CameraInfo.CAMERA_FACING_BACK + && backCameraRestartPreviewOnPictureTaken && (mCameraState != LONGSHOT)) + || (info.facing == CameraInfo.CAMERA_FACING_FRONT + && frontCameraRestartPreviewOnPictureTaken && (mCameraState != LONGSHOT))) { needRestartPreview = true; } if (needRestartPreview) { + Log.d(TAG, "JpegPictureCallback: needRestartPreview"); setupPreview(); if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode()) || CameraUtil.FOCUS_MODE_MW_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode())) { |