diff options
| -rw-r--r-- | res/values/config.xml | 6 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 17 |
2 files changed, 23 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index cba2df45f..8f87c349c 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -35,6 +35,12 @@ <!-- Opens front camera using openLegacy() --> <bool name="front_camera_open_legacy">true</bool> + <!-- Restart preview for back camera onPictureTaken --> + <bool name="back_camera_restart_preview_onPictureTaken">false</bool> + + <!-- Restart preview for front camera onPictureTaken --> + <bool name="front_camera_restart_preview_onPictureTaken">false</bool> + <!-- Set's manufacturer specific parameters on startup. Example: lge-camera=1;cam-mode=0 --> <string name="manufacturer_key_values"></string> 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( |