diff options
author | Sultanxda <sultanxda@gmail.com> | 2016-12-18 10:58:42 -0800 |
---|---|---|
committer | Bruno Martins <bgcngm@gmail.com> | 2018-11-20 12:32:17 +0000 |
commit | a85c90564b4875f1fdaa0540dd85f40417863689 (patch) | |
tree | 27ead5eef6084e01e2b5aa346c6054f03e1cedb0 | |
parent | 85e22dc702e8b24271e78391995aa7bc1bcbed31 (diff) | |
download | android_packages_apps_Snap-a85c90564b4875f1fdaa0540dd85f40417863689.tar.gz android_packages_apps_Snap-a85c90564b4875f1fdaa0540dd85f40417863689.tar.bz2 android_packages_apps_Snap-a85c90564b4875f1fdaa0540dd85f40417863689.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>
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c1ff0c0b7..c21bf0fb2 100644 --- 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()) { |