summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2016-01-08 19:38:15 +0100
committerSteve Kondik <steve@cyngn.com>2016-11-02 12:22:28 -0700
commitdc384071b5495065bef5ed81d3550400c55be6ab (patch)
tree9d217e8d7ba819123576b262d95ab56e93562c2e /src/com/android/camera
parentae13859418d49ad0b36fa7fb860fb3c8092e6e11 (diff)
downloadandroid_packages_apps_Snap-dc384071b5495065bef5ed81d3550400c55be6ab.tar.gz
android_packages_apps_Snap-dc384071b5495065bef5ed81d3550400c55be6ab.tar.bz2
android_packages_apps_Snap-dc384071b5495065bef5ed81d3550400c55be6ab.zip
Snap: restart preview when shutter-speed gets disabled
Change-Id: I3884b23f1c855cfffeb20ca6e2a760732370d772
Diffstat (limited to 'src/com/android/camera')
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 580719d2f..2da413014 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -3833,7 +3833,7 @@ public class PhotoModule
Log.v(TAG, "new picture_size = " + size.width + " x " + size.height);
if (old_size != null && size != null) {
if(!size.equals(old_size) && mCameraState != PREVIEW_STOPPED) {
- Log.v(TAG, "Picture Size changed. Restart Preview");
+ Log.v(TAG, "Picture Size changed. Restart Preview.");
mRestartPreview = true;
}
}
@@ -3996,6 +3996,18 @@ public class PhotoModule
mParameters.setJpegQuality(jpegQuality);
+ // When shutter speed gets disabled preview needs to be restarted
+ if (CameraUtil.isSupported(mParameters, CameraSettings.KEY_SNAPCAM_SHUTTER_SPEED)) {
+ String shutterSpeed = mPreferences.getString(CameraSettings.KEY_SHUTTER_SPEED, null);
+ if (shutterSpeed != null) {
+ String oldShutterSpeed = mParameters.get(CameraSettings.KEY_SNAPCAM_SHUTTER_SPEED);
+ if(!shutterSpeed.equals(oldShutterSpeed) && shutterSpeed.equals("0") && mCameraState != PREVIEW_STOPPED) {
+ Log.v(TAG, "Shutter speed disabled. Restart Preview.");
+ mRestartPreview = true;
+ }
+ }
+ }
+
// For the following settings, we need to check if the settings are
// still supported by latest driver, if not, ignore the settings.