diff options
| author | Doris Liu <tianliu@google.com> | 2013-05-07 13:48:10 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-05-07 15:14:24 -0700 |
| commit | 69ef5ea6ed838cf6fba834811f01122d349a61cf (patch) | |
| tree | e1441d8897f53709ffbc5228d6b1eb10b3f165e8 /src/com/android/camera/VideoModule.java | |
| parent | c9a1195c43d7d9953b3060503188c1f28cd948b8 (diff) | |
| download | android_packages_apps_Snap-69ef5ea6ed838cf6fba834811f01122d349a61cf.tar.gz android_packages_apps_Snap-69ef5ea6ed838cf6fba834811f01122d349a61cf.tar.bz2 android_packages_apps_Snap-69ef5ea6ed838cf6fba834811f01122d349a61cf.zip | |
Fix video capture intent overlapping buttons
Bug: 8839010
Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 0bcdbabb5..f7830a303 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -126,6 +126,7 @@ public class VideoModule implements CameraModule, private boolean mIsVideoCaptureIntent; private boolean mQuickCapture; + private boolean mIsInReviewMode = false; private MediaRecorder mMediaRecorder; private EffectsRecorder mEffectsRecorder; @@ -541,15 +542,22 @@ public class VideoModule implements CameraModule, @OnClickAttr public void onReviewDoneClicked(View v) { + mIsInReviewMode = false; doReturnToCaller(true); } @OnClickAttr public void onReviewCancelClicked(View v) { + mIsInReviewMode = false; stopVideoRecording(); doReturnToCaller(false); } + @Override + public boolean isInReviewMode() { + return mIsInReviewMode; + } + private void onStopVideoRecording() { mEffectsDisplayResult = true; boolean recordFail = stopVideoRecording(); @@ -1525,6 +1533,7 @@ public class VideoModule implements CameraModule, } private void showCaptureResult() { + mIsInReviewMode = true; Bitmap bitmap = null; if (mVideoFileDescriptor != null) { bitmap = Thumbnail.createVideoThumbnailBitmap(mVideoFileDescriptor.getFileDescriptor(), |