diff options
| author | jrizzoli <joey@cyanogenmoditalia.it> | 2016-01-07 21:07:51 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-09 02:32:45 -0800 |
| commit | a4a443b4e2e393d3b0d0e201075a95b02fe0c377 (patch) | |
| tree | 75bd3236cc1c9637562e4bf244cb7214278a008e /src/com/android/camera/PhotoModule.java | |
| parent | 88daff8860dc358a7a084e859f5d72d7a46d9afe (diff) | |
| download | android_packages_apps_Snap-a4a443b4e2e393d3b0d0e201075a95b02fe0c377.tar.gz android_packages_apps_Snap-a4a443b4e2e393d3b0d0e201075a95b02fe0c377.tar.bz2 android_packages_apps_Snap-a4a443b4e2e393d3b0d0e201075a95b02fe0c377.zip | |
Snap: initial materialization
Just for initial ship
Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 52f3a8b84..c222025d8 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -993,8 +993,6 @@ public class PhotoModule return; } - mUI.doShutterAnimation(); - Location loc = getLocationAccordPictureFormat(mParameters.get(KEY_PICTURE_FORMAT)); if (mLongshotSave) { mCameraDevice.takePicture(mHandler, @@ -1246,20 +1244,20 @@ public class PhotoModule !mFocusManager.isZslEnabled() && CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)); - boolean backCameraRestartPreviewOnPictureTaken = + boolean backCameraRestartPreviewOnPictureTaken = mApplicationContext.getResources().getBoolean(R.bool.back_camera_restart_preview_onPictureTaken); - boolean frontCameraRestartPreviewOnPictureTaken = + boolean 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) + if ((info.facing == CameraInfo.CAMERA_FACING_BACK && backCameraRestartPreviewOnPictureTaken) || (info.facing == CameraInfo.CAMERA_FACING_FRONT && frontCameraRestartPreviewOnPictureTaken)) { needRestartPreview = true; } if (needRestartPreview) { setupPreview(); - if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode()) || + if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode()) || CameraUtil.FOCUS_MODE_MW_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode())) { mCameraDevice.cancelAutoFocus(); } @@ -2732,7 +2730,7 @@ public class PhotoModule if (!mSnapshotOnIdle) { // If the focus mode is continuous autofocus, call cancelAutoFocus to // resume it because it may have been paused by autoFocus call. - if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode()) || + if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode()) || CameraUtil.FOCUS_MODE_MW_CONTINUOUS_PICTURE.equals(mFocusManager.getFocusMode())) { mCameraDevice.cancelAutoFocus(); } @@ -4380,8 +4378,8 @@ public class PhotoModule mMeteringAreaSupported = CameraUtil.isMeteringAreaSupported(mInitialParams); mAeLockSupported = CameraUtil.isAutoExposureLockSupported(mInitialParams); mAwbLockSupported = CameraUtil.isAutoWhiteBalanceLockSupported(mInitialParams); - - if (mInitialParams.getSupportedFocusModes().contains(CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE) || + + if (mInitialParams.getSupportedFocusModes().contains(CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE) || mInitialParams.getSupportedFocusModes().contains(CameraUtil.FOCUS_MODE_MW_CONTINUOUS_PICTURE)) { mContinuousFocusSupported = true; } else { |