Merge "Show only the actual recorded time in time lapse mode."

1 files changed, 8 insertions, 6 deletions

diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 3bbf9b4..725f133 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1667,13 +1667,15 @@ public class VideoCamera extends NoSearchActivity
         if (countdownRemainingTime) {
             deltaAdjusted = Math.max(0, mMaxVideoDurationInMs - deltaAdjusted) + 999;
         }
-        String text = millisecondToTimeString(deltaAdjusted, false);
+        String text;
 
-        if (mCaptureTimeLapse) {
-            // Since the length of time lapse video is different from the length
-            // of the actual wall clock time elapsed, we display the video length
-            // alongside the wall clock time.
-            text += " (" + getTimeLapseVideoLengthString(delta) + ")";
+        if (!mCaptureTimeLapse) {
+            text = millisecondToTimeString(deltaAdjusted, false);
+        } else {
+            // The length of time lapse video is different from the length
+            // of the actual wall clock time elapsed. Display the video length
+            // only.
+            text = getTimeLapseVideoLengthString(delta);
         }
 
         mRecordingTimeView.setText(text);