summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2012-10-03 09:10:15 -0700
committerMichael Kolb <kolby@google.com>2012-10-03 09:10:15 -0700
commitd202574157ef3f9e655bbadc6fe87a5638ecb690 (patch)
tree0d324ed09b3441ddc41d58b0623940acce419ffa /src
parentd231988e6742b64303be4da3d6d0296298765ee9 (diff)
downloadCamera-d202574157ef3f9e655bbadc6fe87a5638ecb690.tar.gz
Don't allow swipe to menu during video recording
Bug: 7276804 Change-Id: I45cc94b27037dc0d510403e4e32c2e407c6bef32
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PreviewGestures.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PreviewGestures.java b/src/com/android/camera/PreviewGestures.java
index c54f2f99..c31bcc71 100644
--- a/src/com/android/camera/PreviewGestures.java
+++ b/src/com/android/camera/PreviewGestures.java
@@ -214,7 +214,7 @@ public class PreviewGestures
cancelActivityTouchHandling(m);
if (isSwipe(m , false)) {
mMode = MODE_NONE;
- } else {
+ } else if (!mZoomOnly) {
mMode = MODE_PIE;
openPie();
sendToPie(m);