diff options
| author | Doris Liu <tianliu@google.com> | 2013-03-27 17:25:43 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-03-27 17:25:43 -0700 |
| commit | 61f2b082014fe4402dd208029e9378dd5cb1fd1d (patch) | |
| tree | e442cd692f8bbc3c33461cd555c91fad541d826f /src | |
| parent | c6af786bdc2488c2c7a69846b81261f31ffdccb3 (diff) | |
| download | android_packages_apps_Snap-61f2b082014fe4402dd208029e9378dd5cb1fd1d.tar.gz android_packages_apps_Snap-61f2b082014fe4402dd208029e9378dd5cb1fd1d.tar.bz2 android_packages_apps_Snap-61f2b082014fe4402dd208029e9378dd5cb1fd1d.zip | |
Disable preview gestures when shutter is pressed
Bug:8333662
Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
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 94c862502..8217e25ac 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); |