Disable preview gestures when shutter is pressed

Bug:8333662
Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index ea50033..1f31778 100644 (file)
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -588,7 +588,7 @@ public class VideoModule implements CameraModule,
 
     @Override
     public void onShutterButtonFocus(boolean pressed) {
-        // Do nothing (everything happens in onShutterButtonClick).
+        mUI.setShutterPressed(pressed);
     }
 
     private void readVideoPreferences() {

diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 63c1909..0eac49d 100644 (file)
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -320,6 +320,12 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener,
         return false;
     }
 
+    // disable preview gestures after shutter is pressed
+    public void setShutterPressed(boolean pressed) {
+        if (mGestures == null) return;
+        mGestures.setEnabled(!pressed);
+    }
+
     public void enableShutter(boolean enable) {
         if (mShutterButton != null) {
             mShutterButton.setEnabled(enable);