diff options
| author | Michael Kolb <kolby@google.com> | 2013-03-11 12:37:40 -0700 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2013-03-11 12:53:27 -0700 |
| commit | b1aeb3963fb67b1ea251cb5f7790b2d2f8261a0c (patch) | |
| tree | ad4bb1e4d43da8841f66d1d9f13fe0bb70047c5a /src | |
| parent | 4ef1d738b796d9b6af448d9bfc46e262a97eafcd (diff) | |
| download | android_packages_apps_Snap-b1aeb3963fb67b1ea251cb5f7790b2d2f8261a0c.tar.gz android_packages_apps_Snap-b1aeb3963fb67b1ea251cb5f7790b2d2f8261a0c.tar.bz2 android_packages_apps_Snap-b1aeb3963fb67b1ea251cb5f7790b2d2f8261a0c.zip | |
Don't record video before preview is started
Bug: 8358998
Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 7bda657a2..a7a5335c6 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -810,7 +810,9 @@ public class VideoModule implements CameraModule, public void onResumeAfterSuper() { if (mActivity.mOpenCameraFail || mActivity.mCameraDisabled) return; - + if (mShutterButton != null) { + mShutterButton.setEnabled(false); + } mZoomValue = 0; showVideoSnapshotUI(false); @@ -884,7 +886,6 @@ public class VideoModule implements CameraModule, } } - mPreviewing = true; setDisplayOrientation(); mActivity.mCameraDevice.setDisplayOrientation(mCameraDisplayOrientation); @@ -903,9 +904,13 @@ public class VideoModule implements CameraModule, mActivity.mCameraDevice.setPreviewDisplayAsync(mPreviewSurfaceView.getHolder()); } mActivity.mCameraDevice.startPreviewAsync(); + mPreviewing = true; + onPreviewStarted(); } else { initializeEffectsPreview(); mEffectsRecorder.startPreview(); + mPreviewing = true; + onPreviewStarted(); } } catch (Throwable ex) { closeCamera(); @@ -922,6 +927,13 @@ public class VideoModule implements CameraModule, } }); } + + } + + private void onPreviewStarted() { + if (mShutterButton != null) { + mShutterButton.setEnabled(true); + } } private void stopPreview() { |