diff options
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 4ccc9bc..8166592 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -41,8 +41,6 @@ <!-- Camera Preferences Time Lapse Frame Interval entries --> <string-array name="pref_video_time_lapse_frame_interval_entries" translatable="false"> <item>@string/pref_camera_recordlocation_entry_off</item> - <item>@string/pref_video_time_lapse_frame_interval_entry_250</item> - <item>@string/pref_video_time_lapse_frame_interval_entry_500</item> <item>@string/pref_video_time_lapse_frame_interval_entry_1000</item> <item>@string/pref_video_time_lapse_frame_interval_entry_1500</item> <item>@string/pref_video_time_lapse_frame_interval_entry_2000</item> @@ -56,8 +54,6 @@ for time lapse recording --> <string-array name="pref_video_time_lapse_frame_interval_entryvalues" translatable="false"> <item>0</item> - <item>250</item> - <item>500</item> <item>1000</item> <item>1500</item> <item>2000</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index c4612c7..a073872 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -166,8 +166,6 @@ <string name="pref_video_time_lapse_frame_interval_title">Time lapse interval</string> <string name="pref_video_time_lapse_frame_interval_default" translatable="false">0</string> <!-- The time interval between frame capture for time lapse recording --> - <string name="pref_video_time_lapse_frame_interval_entry_250" translatable="false">0.25s</string> - <string name="pref_video_time_lapse_frame_interval_entry_500" translatable="false">0.5s</string> <string name="pref_video_time_lapse_frame_interval_entry_1000" translatable="false">1s</string> <string name="pref_video_time_lapse_frame_interval_entry_1500" translatable="false">1.5s</string> <string name="pref_video_time_lapse_frame_interval_entry_2000" translatable="false">2s</string> 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) { |