diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-09-21 14:29:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-21 14:29:52 -0700 |
| commit | 82d8d49ab1d0d303fc2e1c81e89389a81404895f (patch) | |
| tree | 0b1c8f7d2398ddb9352c845a936912bcf15eb8dc | |
| parent | a369cd3153170975a5e5bd6fa5544dcd6f22ee85 (diff) | |
| parent | e335860d0e456a8182bee3aa67c52d1395b6f563 (diff) | |
| download | LegacyCamera-82d8d49ab1d0d303fc2e1c81e89389a81404895f.zip LegacyCamera-82d8d49ab1d0d303fc2e1c81e89389a81404895f.tar.gz LegacyCamera-82d8d49ab1d0d303fc2e1c81e89389a81404895f.tar.bz2 | |
Merge "Disallow video snapshot while using effects in recording." into ics-factoryrom
| -rw-r--r-- | src/com/android/camera/VideoCamera.java | 3 |
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; } |