diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-04-11 20:19:34 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-04-11 20:19:34 -0700 |
| commit | 174f8c4b49dbdf257ed8ae6c54865a7607e6eb80 (patch) | |
| tree | 7836ea38d133cf594be90f5c4f036185d900aedc /src/com/android/camera/VideoUI.java | |
| parent | 47f4cc8f69c89ac68fb2ac3cb74c3fcc10dc5ff5 (diff) | |
| parent | ea667a61a841c49bf4d7a48909614f22decd2d22 (diff) | |
| download | android_packages_apps_Snap-174f8c4b49dbdf257ed8ae6c54865a7607e6eb80.tar.gz android_packages_apps_Snap-174f8c4b49dbdf257ed8ae6c54865a7607e6eb80.tar.bz2 android_packages_apps_Snap-174f8c4b49dbdf257ed8ae6c54865a7607e6eb80.zip | |
Merge "Camera2: remove the pause button when timelapse is on"
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index b16797ce1..9ffd1a113 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -98,6 +98,7 @@ public class VideoUI implements PieRenderer.PieListener, private View mFlashOverlay; private boolean mOrientationResize; private boolean mPrevOrientationResize; + private boolean mIsTimeLapse = false; private View mPreviewCover; private SurfaceView mSurfaceView = null; @@ -550,6 +551,7 @@ public class VideoUI implements PieRenderer.PieListener, if (mTimeLapseLabel != null) { mTimeLapseLabel.setVisibility(enable ? View.VISIBLE : View.GONE); } + mIsTimeLapse = enable; } private void openMenu() { @@ -640,7 +642,7 @@ public class VideoUI implements PieRenderer.PieListener, hideSwitcher(); mRecordingTimeView.setText(""); mRecordingTimeView.setVisibility(View.VISIBLE); - mPauseButton.setVisibility(View.VISIBLE); + mPauseButton.setVisibility(mIsTimeLapse ? View.GONE : View.VISIBLE); } else { mShutterButton.setImageResource(R.drawable.btn_new_shutter_video); if (!mController.isVideoCaptureIntent()) { |