summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-12-10 16:26:42 +0800
committerWu-cheng Li <wuchengli@google.com>2010-12-10 16:28:46 +0800
commit9bbd157589ef9ee4a525bc8bc49586c8ba45b3ae (patch)
tree1d800d18324fe0778b0534266a1cee590d50dc7c /src
parentb6cd13cac0d29a6028c94906d596f0ea5518a980 (diff)
downloadpackages_apps_LegacyCamera-9bbd157589ef9ee4a525bc8bc49586c8ba45b3ae.zip
packages_apps_LegacyCamera-9bbd157589ef9ee4a525bc8bc49586c8ba45b3ae.tar.gz
packages_apps_LegacyCamera-9bbd157589ef9ee4a525bc8bc49586c8ba45b3ae.tar.bz2
Enable time lapse recording UI.
Enable time lapse so people can try it. bug:2901600 Change-Id: Idb20c25f1fc52981226dc3b5ea6e88bb9de0639d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/VideoCamera.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 0e25db0..270c42d 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -488,9 +488,8 @@ public class VideoCamera extends NoSearchActivity
String[] keys = new String[]{CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE,
CameraSettings.KEY_WHITE_BALANCE,
CameraSettings.KEY_COLOR_EFFECT,
- CameraSettings.KEY_VIDEO_QUALITY};
- // TODO: add this back after time lapse recording is ready.
- //,CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL};
+ CameraSettings.KEY_VIDEO_QUALITY,
+ CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL};
mControlPanel.initialize(this, mPreferenceGroup, keys, false);
mControlPanel.setListener(new MyControlPanelListener());
mPopupGestureDetector = new GestureDetector(this,
@@ -698,9 +697,7 @@ public class VideoCamera extends NoSearchActivity
String frameIntervalStr = mPreferences.getString(
CameraSettings.KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL,
getString(R.string.pref_video_time_lapse_frame_interval_default));
- // TODO: uncomment after time lapse recording is ready.
- //mTimeBetweenTimeLapseFrameCaptureMs = Integer.parseInt(frameIntervalStr);
- mTimeBetweenTimeLapseFrameCaptureMs = 0;
+ mTimeBetweenTimeLapseFrameCaptureMs = Integer.parseInt(frameIntervalStr);
mCaptureTimeLapse = (mTimeBetweenTimeLapseFrameCaptureMs != 0);
int profileQuality;