summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2016-12-18 10:58:42 -0800
committerChippa-a <vusal1372@gmail.com>2019-10-25 15:55:25 +0300
commit5ee62ade8be38d030c80405bc855a4256480bc4b (patch)
tree0085fa5f872107876bada09edacfa39a6cf98a3d /src/com/android/camera
parentbbd723b12a51f1141e425ac5f62a2abe3df0a4e8 (diff)
downloadandroid_packages_apps_Snap-5ee62ade8be38d030c80405bc855a4256480bc4b.tar.gz
android_packages_apps_Snap-5ee62ade8be38d030c80405bc855a4256480bc4b.tar.bz2
android_packages_apps_Snap-5ee62ade8be38d030c80405bc855a4256480bc4b.zip
SnapdragonCamera: Enforce 120ms delay in between shutter clicks
To prevent unintentional duplicate photo captures. Change-Id: I5b24d834ba6eb7e2f606d656a71f5878ab8d08f5 Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Diffstat (limited to 'src/com/android/camera')
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 06bff865a..a338c527b 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -160,6 +160,7 @@ public class PhotoModule
private static final int SET_PHOTO_UI_PARAMS = 11;
private static final int SWITCH_TO_GCAM_MODULE = 12;
private static final int ON_PREVIEW_STARTED = 13;
+ private static final int UNLOCK_CAM_SHUTTER = 14;
// The subset of parameters we need to update in setCameraParameters().
private static final int UPDATE_PARAM_INITIALIZE = 1;
@@ -548,6 +549,11 @@ public class PhotoModule
onPreviewStarted();
break;
}
+
+ case UNLOCK_CAM_SHUTTER: {
+ mUI.enableShutter(true);
+ break;
+ }
}
}
}
@@ -1835,10 +1841,12 @@ public class PhotoModule
mPreviewRestartSupport &= PIXEL_FORMAT_JPEG.equalsIgnoreCase(
pictureFormat);
+ mUI.enableShutter(false);
+
// We don't want user to press the button again while taking a
// multi-second HDR photo. For longshot, no need to disable.
- if (CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) {
- mUI.enableShutter(false);
+ if (!CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) {
+ mHandler.sendEmptyMessageDelayed(UNLOCK_CAM_SHUTTER, 120);
}
if (!isShutterSoundOn()) {