diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-08-22 05:38:28 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-08-22 05:38:28 -0700 |
| commit | 4d05e527a9304bff9de3a92a20d54e1a226fadd2 (patch) | |
| tree | ec5823ec1a73145fe0d9ff61bc7cf81d87c16722 | |
| parent | 6f206ce30f7c7ebb379488499b006a5da7a6e7c4 (diff) | |
| parent | fb60d5db6b1bf9d4b995ef463c6c8d158f9d055a (diff) | |
| download | android_packages_apps_Snap-4d05e527a9304bff9de3a92a20d54e1a226fadd2.tar.gz android_packages_apps_Snap-4d05e527a9304bff9de3a92a20d54e1a226fadd2.tar.bz2 android_packages_apps_Snap-4d05e527a9304bff9de3a92a20d54e1a226fadd2.zip | |
Merge "SnapdragonCamera: Don't disable shutter button in longshot mode."
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8a616d33e..4948772c1 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1460,8 +1460,10 @@ public class PhotoModule pictureFormat); // We don't want user to press the button again while taking a - // multi-second HDR photo. - mUI.enableShutter(false); + // multi-second HDR photo. For longshot, no need to disable. + if (mCameraState != LONGSHOT) { + mUI.enableShutter(false); + } if (mCameraState == LONGSHOT) { if(mLongshotSave) { |