diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2016-01-06 00:10:40 +0100 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2016-01-05 15:20:21 -0800 |
| commit | 070b23a7ac37667a4995468eb8c2f04707a24612 (patch) | |
| tree | 1644d2613e5717058dac949c51661d4b4a9c6ae1 /src | |
| parent | 282936212b26dde7d6b18885877945f2fbe780a2 (diff) | |
| download | android_packages_apps_Snap-070b23a7ac37667a4995468eb8c2f04707a24612.tar.gz android_packages_apps_Snap-070b23a7ac37667a4995468eb8c2f04707a24612.tar.bz2 android_packages_apps_Snap-070b23a7ac37667a4995468eb8c2f04707a24612.zip | |
add options to restart preview onPictureTaken
Change-Id: I7ce9d6f2323e367743e6d4c9662b846d3052f2a4
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index b9026bc01..5a05ae043 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -61,6 +61,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.LinearLayout; import android.widget.TextView; +import com.android.camera.app.CameraApp; import com.android.camera.CameraManager.CameraAFCallback; import com.android.camera.CameraManager.CameraAFMoveCallback; import com.android.camera.CameraManager.CameraPictureCallback; @@ -247,6 +248,8 @@ public class PhotoModule private boolean mShutterPressing = false; + private static Context mApplicationContext; + private Runnable mDoSnapRunnable = new Runnable() { @Override public void run() { @@ -814,6 +817,8 @@ public class PhotoModule return; } + mApplicationContext = CameraApp.getContext(); + // Initialize location service. boolean recordLocation = RecordLocationPreference.get( mPreferences, mContentResolver); @@ -1233,6 +1238,18 @@ public class PhotoModule && (mSnapshotMode != CameraInfo.CAMERA_SUPPORT_MODE_ZSL) && ((mReceivedSnapNum == mBurstSnapNum) && (mCameraState != LONGSHOT)); needRestartPreview |= (isLongshotDone() && !mFocusManager.isZslEnabled()); + + boolean backCameraRestartPreviewOnPictureTaken = + mApplicationContext.getResources().getBoolean(R.bool.back_camera_restart_preview_onPictureTaken); + 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) + || (info.facing == CameraInfo.CAMERA_FACING_FRONT && frontCameraRestartPreviewOnPictureTaken)) { + needRestartPreview = true; + } + if (needRestartPreview) { setupPreview(); if (CameraUtil.FOCUS_MODE_CONTINUOUS_PICTURE.equals( |