summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2011-09-21 13:55:42 -0700
committerEino-Ville Talvala <etalvala@google.com>2011-09-21 13:55:42 -0700
commite335860d0e456a8182bee3aa67c52d1395b6f563 (patch)
treed3af6d4905bbb5486f5caeb1dbb75a851d516123 /src/com
parent2df78e141f055b39a0a8a15b0710c564f39f1368 (diff)
downloadLegacyCamera-e335860d0e456a8182bee3aa67c52d1395b6f563.zip
LegacyCamera-e335860d0e456a8182bee3aa67c52d1395b6f563.tar.gz
LegacyCamera-e335860d0e456a8182bee3aa67c52d1395b6f563.tar.bz2
Disallow video snapshot while using effects in recording.
Bug: 5350124 Change-Id: I515f7982072987e888408f8d667a6a8cd422104b
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/camera/VideoCamera.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 39d3298..070363b 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -2183,7 +2183,8 @@ public class VideoCamera extends ActivityBase
// Preview area is touched. Take a picture.
@Override
public boolean onTouch(View v, MotionEvent e) {
- if (mPausing || mSnapshotInProgress || !mMediaRecorderRecording) {
+ if (mPausing || mSnapshotInProgress
+ || !mMediaRecorderRecording || effectsActive()) {
return false;
}