diff options
| author | Suman Mukherjee <sumam@codeaurora.org> | 2014-03-05 10:34:37 +0530 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-10-29 07:02:09 +0000 |
| commit | 4287797af32351165e03885b33733a60c1fb93cb (patch) | |
| tree | 008f3399fd63873f5787cfa64c62f2ed15746ee7 | |
| parent | 9dc82ab8b42a547a4b1ff2cbdc8c13deb10093af (diff) | |
| download | android_packages_apps_Camera2-4287797af32351165e03885b33733a60c1fb93cb.tar.gz android_packages_apps_Camera2-4287797af32351165e03885b33733a60c1fb93cb.tar.bz2 android_packages_apps_Camera2-4287797af32351165e03885b33733a60c1fb93cb.zip | |
Camera: Don't enable shutterdown for count down timer
For count down timer case, capture process should take place after
timer expiry. Otherwise flash is getting turned ON immediately after
pressing shutter button and then again during capture.
Fix made by not allowing to do anything related to capture process
except turning timer ON.
Change-Id: I843c88ccc9c03235dc6a2a7638221c778bfc6551
CRs-Fixed: 623445
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 09e317915..a22c9f576 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1724,7 +1724,12 @@ public class PhotoModule if (pressed && !canTakePicture()) return; if (pressed) { - mFocusManager.onShutterDown(); + String timer = mPreferences.getString( + CameraSettings.KEY_TIMER, + mActivity.getString(R.string.pref_camera_timer_default)); + if (timer.equals("0")) { + mFocusManager.onShutterDown(); + } } else { // for countdown mode, we need to postpone the shutter release // i.e. lock the focus during countdown. |