Remove 0.25s and 0.5s from time lapse recording.

Software encoder needs more than 0.25s to encode a frame.
Besides, we will add arc shaped indicator and it looks
bad with 0.25s and 0.5s.

Change-Id: Ic54748d91d91ad7fcc4701ede6cf1e07af73ecfb

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index f5d0a23..7cda110 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -128,6 +128,7 @@ public class CameraSettings {
 
     private void initPreference(PreferenceGroup group) {
         ListPreference videoQuality = group.findPreference(KEY_VIDEO_QUALITY);
+        ListPreference timeLapseInterval = group.findPreference(KEY_VIDEO_TIME_LAPSE_FRAME_INTERVAL);
         ListPreference pictureSize = group.findPreference(KEY_PICTURE_SIZE);
         ListPreference whiteBalance =  group.findPreference(KEY_WHITE_BALANCE);
         ListPreference colorEffect = group.findPreference(KEY_COLOR_EFFECT);
@@ -176,6 +177,8 @@ public class CameraSettings {
         }
         if (exposure != null) buildExposureCompensation(group, exposure);
         if (cameraIdPref != null) buildCameraId(group, cameraIdPref);
+
+        if (timeLapseInterval != null) resetIfInvalid(timeLapseInterval);
     }
 
     private static List<String> getSupportedTimeLapseProfiles(int cameraId) {
@@ -273,6 +276,10 @@ public class CameraSettings {
             return;
         }
 
+        resetIfInvalid(pref);
+    }
+
+    private void resetIfInvalid(ListPreference pref) {
         // Set the value to the first entry if it is invalid.
         String value = pref.getValue();
         if (pref.findIndexOfValue(value) == NOT_FOUND) {