diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-22 17:17:53 +0100 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:03:10 +0100 |
| commit | 211633db4133b43526108b658632a142ac4755dd (patch) | |
| tree | b85abbf4ad58dee209a91b5a401292d0a37600b8 /src | |
| parent | 99f698662f0f268fc1e1c5120d218800a263e4d9 (diff) | |
| download | android_packages_apps_Snap-211633db4133b43526108b658632a142ac4755dd.tar.gz android_packages_apps_Snap-211633db4133b43526108b658632a142ac4755dd.tar.bz2 android_packages_apps_Snap-211633db4133b43526108b658632a142ac4755dd.zip | |
Snap: do not restart preview during longshots
Change-Id: I6ad439dc0be7c6e0d13ac7c22aacdc0ad559d051
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index d879ed614..bb3aadb62 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1437,7 +1437,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 @@ -1464,7 +1464,7 @@ public class PhotoModule && (mSnapshotMode != CameraInfoWrapper.CAMERA_SUPPORT_MODE_ZSL) && (mReceivedSnapNum == mBurstSnapNum); - needRestartPreview |= mLgeHdrMode; + needRestartPreview |= mLgeHdrMode && (mCameraState != LONGSHOT); boolean backCameraRestartPreviewOnPictureTaken = false; boolean frontCameraRestartPreviewOnPictureTaken = false; @@ -1477,13 +1477,14 @@ public class PhotoModule CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId]; if ((info.facing == CameraInfo.CAMERA_FACING_BACK - && backCameraRestartPreviewOnPictureTaken) + && backCameraRestartPreviewOnPictureTaken && (mCameraState != LONGSHOT)) || (info.facing == CameraInfo.CAMERA_FACING_FRONT - && frontCameraRestartPreviewOnPictureTaken)) { + && 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())) { |