diff options
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r-- | src/com/android/camera/VideoModule.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index c136358e1..4d01bc320 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -652,7 +652,7 @@ public class VideoModule implements CameraModule, if (mQuickCapture) { doReturnToCaller(!recordFail); } else if (!recordFail) { - showAlert(); + showCaptureResult(); } } } else if (!recordFail){ @@ -1658,14 +1658,14 @@ public class VideoModule implements CameraModule, } } - private void showAlert() { + private void showCaptureResult() { Bitmap bitmap = null; if (mVideoFileDescriptor != null) { bitmap = Thumbnail.createVideoThumbnailBitmap(mVideoFileDescriptor.getFileDescriptor(), - mPreviewFrameLayout.getWidth()); + mDesiredPreviewWidth); } else if (mCurrentVideoFilename != null) { bitmap = Thumbnail.createVideoThumbnailBitmap(mCurrentVideoFilename, - mPreviewFrameLayout.getWidth()); + mDesiredPreviewWidth); } if (bitmap != null) { // MetadataRetriever already rotates the thumbnail. We should rotate @@ -2053,7 +2053,7 @@ public class VideoModule implements CameraModule, if (mQuickCapture) { doReturnToCaller(true); } else { - showAlert(); + showCaptureResult(); } } } @@ -2176,6 +2176,7 @@ public class VideoModule implements CameraModule, mShutterButton = mActivity.getShutterButton(); mShutterButton.setImageResource(R.drawable.btn_new_shutter_video); mShutterButton.setOnShutterButtonListener(this); + mShutterButton.setVisibility(View.VISIBLE); mShutterButton.requestFocus(); mShutterButton.enableTouch(true); @@ -2203,7 +2204,6 @@ public class VideoModule implements CameraModule, @Override public void onConfigurationChanged(Configuration newConfig) { setDisplayOrientation(); - // Change layout in response to configuration change LayoutInflater inflater = mActivity.getLayoutInflater(); ((ViewGroup) mRootView).removeAllViews(); @@ -2223,6 +2223,9 @@ public class VideoModule implements CameraModule, initializeZoom(); onFullScreenChanged(mActivity.isInCameraApp()); updateOnScreenIndicators(); + if (mIsVideoCaptureIntent && mVideoFileDescriptor != null) { + showCaptureResult(); + } } @Override |