summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2016-01-08 19:38:15 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:02:33 +0100
commit634d8917802bb5e3cab8bde01663e8f0059593f7 (patch)
treed3e713cd39a7572662f31e0dc173b8017ac74f92 /src
parent43f649821a1266edf72780cbe84e5f4b7816d003 (diff)
downloadandroid_packages_apps_Snap-634d8917802bb5e3cab8bde01663e8f0059593f7.tar.gz
android_packages_apps_Snap-634d8917802bb5e3cab8bde01663e8f0059593f7.tar.bz2
android_packages_apps_Snap-634d8917802bb5e3cab8bde01663e8f0059593f7.zip
Snap: restart preview when shutter-speed gets disabled
Change-Id: I3884b23f1c855cfffeb20ca6e2a760732370d772
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 86794b946..ae5532d1d 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -4141,7 +4141,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;
}
}
@@ -4279,6 +4279,19 @@ 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.