diff options
| author | Doris Liu <tianliu@google.com> | 2013-03-28 16:50:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-28 16:50:07 +0000 |
| commit | 2a68debc4c7a285dff36c7639387fed1e8e02b45 (patch) | |
| tree | 62a7c2e621f2bdaaa59f4620e1abd608e1fafaf1 /src | |
| parent | 83facdef714b729aeab4d51919206d95a7afb165 (diff) | |
| parent | 61f2b082014fe4402dd208029e9378dd5cb1fd1d (diff) | |
| download | android_packages_apps_Snap-2a68debc4c7a285dff36c7639387fed1e8e02b45.tar.gz android_packages_apps_Snap-2a68debc4c7a285dff36c7639387fed1e8e02b45.tar.bz2 android_packages_apps_Snap-2a68debc4c7a285dff36c7639387fed1e8e02b45.zip | |
Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index ea50033fc..1f31778df 100644 --- 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 63c190984..0eac49d9b 100644 --- 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); |