diff options
| author | Doris Liu <tianliu@google.com> | 2013-10-09 00:02:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-09 00:02:13 +0000 |
| commit | 607634cafd9a0b626de8390d855bdabe23a4738b (patch) | |
| tree | bf9ced2a00174350c2b1c1dccf9243a0e56e6d07 /src | |
| parent | 2ca6c0f77ab8c70558e2ad4937d2fdd1e505b0f5 (diff) | |
| parent | fe6596c3474f0ffbf03a2b7a7d89ea9cc9d9d61d (diff) | |
| download | android_packages_apps_Snap-607634cafd9a0b626de8390d855bdabe23a4738b.tar.gz android_packages_apps_Snap-607634cafd9a0b626de8390d855bdabe23a4738b.tar.bz2 android_packages_apps_Snap-607634cafd9a0b626de8390d855bdabe23a4738b.zip | |
Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index dc04c8017..30f435e74 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1225,7 +1225,7 @@ public class VideoModule implements CameraModule, mMediaRecorderRecording = true; mOrientationManager.lockOrientation(); mRecordingStartTime = SystemClock.uptimeMillis(); - mUI.showRecordingUI(true, mParameters.isZoomSupported()); + mUI.showRecordingUI(true); updateRecordingTime(); keepScreenOn(); @@ -1306,7 +1306,7 @@ public class VideoModule implements CameraModule, closeCamera(); } - mUI.showRecordingUI(false, mParameters.isZoomSupported()); + mUI.showRecordingUI(false); if (!mIsVideoCaptureIntent) { mUI.enableCameraControls(true); } diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 464cf0ee8..d255ed7ee 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -85,6 +85,7 @@ public class VideoUI implements PieRenderer.PieListener, private View mMenuButton; private OnScreenIndicators mOnScreenIndicators; private RotateLayout mRecordingTimeRect; + private boolean mRecordingStarted = false; private SurfaceTexture mSurfaceTexture; private VideoController mController; private int mZoomMax; @@ -431,7 +432,10 @@ public class VideoUI implements PieRenderer.PieListener, mPreviewThumb.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - mActivity.gotoGallery(); + // Do not allow navigation to filmstrip during video recording + if (!mRecordingStarted) { + mActivity.gotoGallery(); + } } }); } @@ -550,7 +554,8 @@ public class VideoUI implements PieRenderer.PieListener, mController.onSingleTapUp(view, x, y); } - public void showRecordingUI(boolean recording, boolean zoomSupported) { + public void showRecordingUI(boolean recording) { + mRecordingStarted = recording; mMenuButton.setVisibility(recording ? View.GONE : View.VISIBLE); mOnScreenIndicators.setVisibility(recording ? View.GONE : View.VISIBLE); if (recording) { |