diff options
| author | Kerong Sui <ksui@codeaurora.org> | 2013-10-25 10:22:15 +0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-11-10 07:55:48 -0800 |
| commit | 93dc61d7b20e4d505457ef202bf39b8cc57210c3 (patch) | |
| tree | 2be23d73bda296969042960b831d291a642b231a | |
| parent | 3cd77029aee72295c770d7abade41fa9adc6fa6b (diff) | |
| download | android_packages_apps_Gallery2-93dc61d7b20e4d505457ef202bf39b8cc57210c3.tar.gz android_packages_apps_Gallery2-93dc61d7b20e4d505457ef202bf39b8cc57210c3.tar.bz2 android_packages_apps_Gallery2-93dc61d7b20e4d505457ef202bf39b8cc57210c3.zip | |
Gallery2: not enable video pause feature for Timelapse recording
Current design do not support video pause for timelapse recording,
so disable this feature for timelapse recording.
Change-Id: Ib5dd90569c52f9db41988384f2a58ed789c87c49
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index dcb0de899..761fc128e 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1787,7 +1787,7 @@ public class VideoModule implements CameraModule, } mRecordingTotalTime = 0L; mRecordingStartTime = SystemClock.uptimeMillis(); - mUI.showRecordingUI(true, mParameters.isZoomSupported()); + mUI.showRecordingUI(true, mParameters.isZoomSupported(), mCaptureTimeLapse); updateRecordingTime(); keepScreenOn(); @@ -1895,7 +1895,7 @@ public class VideoModule implements CameraModule, closeCamera(closeEffects); } - mUI.showRecordingUI(false, mParameters.isZoomSupported()); + mUI.showRecordingUI(false, mParameters.isZoomSupported(), mCaptureTimeLapse); if (!mIsVideoCaptureIntent) { mUI.enableCameraControls(true); } diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index b9774d2a6..47fe2bcfd 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -432,7 +432,7 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener, return mSurfaceViewReady; } - public void showRecordingUI(boolean recording, boolean zoomSupported) { + public void showRecordingUI(boolean recording, boolean zoomSupported, boolean isTimeLapse) { mMenu.setVisibility(recording ? View.GONE : View.VISIBLE); mOnScreenIndicators.setVisibility(recording ? View.GONE : View.VISIBLE); if (recording) { @@ -440,7 +440,9 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener, mActivity.hideSwitcher(); mRecordingTimeView.setText(""); mRecordingTimeView.setVisibility(View.VISIBLE); - mPauseButton.setVisibility(View.VISIBLE); + if (!isTimeLapse) { + mPauseButton.setVisibility(View.VISIBLE); + } // The camera is not allowed to be accessed in older api levels during // recording. It is therefore necessary to hide the zoom UI on older // platforms. @@ -453,7 +455,8 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener, mShutterButton.setImageResource(R.drawable.btn_new_shutter_video); mActivity.showSwitcher(); mRecordingTimeView.setVisibility(View.GONE); - mPauseButton.setVisibility(View.GONE); + if (!isTimeLapse) + mPauseButton.setVisibility(View.GONE); if (!ApiHelper.HAS_ZOOM_WHEN_RECORDING && zoomSupported) { // TODO: enable zoom UI here. } |