diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-01 15:10:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-01 15:10:59 -0700 |
| commit | 084ce0dc6874ffcdc3adffdd6a6752a046301459 (patch) | |
| tree | a0a001d1608bcec31fe800da6c4d33c2b4130286 /src | |
| parent | 99431bde666b0938d08a9ad1becb97b8f496e1f2 (diff) | |
| parent | b37e03a6deabdfbbacda71379ff22775180a5735 (diff) | |
| download | android_packages_apps_Snap-084ce0dc6874ffcdc3adffdd6a6752a046301459.tar.gz android_packages_apps_Snap-084ce0dc6874ffcdc3adffdd6a6752a046301459.tar.bz2 android_packages_apps_Snap-084ce0dc6874ffcdc3adffdd6a6752a046301459.zip | |
Merge "SnapdragonCamera: Don`t capture in high speed session" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 4 | ||||
| -rwxr-xr-x | src/com/android/camera/CaptureUI.java | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index e171b8b77..c3cfffc54 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -5264,7 +5264,9 @@ public class CaptureModule implements CameraModule, PhotoController, } if (mIsRecordingVideo) { - captureVideoSnapshot(getMainCameraId()); + if (mUI.isShutterEnabled()) { + captureVideoSnapshot(getMainCameraId()); + } } else { String timer = mSettingsManager.getValue(SettingsManager.KEY_TIMER); diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 57ef697b2..c4952eb87 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -1421,6 +1421,10 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } } + public boolean isShutterEnabled() { + return mShutterButton.isEnabled(); + } + /** * Enables or disables the video button. */ |