Fix 2166632: Change of wording in Camera ->Video ->Settings
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index de32a33..b6cb407 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -34,6 +34,7 @@
<item>@string/pref_camera_video_duration_entry_30</item>
</string-array>
+ <!-- The numbers are in minutes, except -1 means the duration suitable for mms. -->
<string-array name="pref_camera_video_duration_entryvalues" translatable="false">
<item>-1</item>
<item>10</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 174cc6a..3289d5a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -329,7 +329,7 @@
<string name="pref_camera_videoquality_dialogtitle">Video quality</string>
<!-- Default video duration setting. A numerical value.-->
- <string name="pref_camera_video_duration_default" translatable="false">-1</string>
+ <string name="pref_camera_video_duration_default" translatable="false">10</string>
<!-- Settings screen, Video duration title -->
<string name="pref_camera_video_duration_title">Video duration</string>
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 2cdce3a..0f28902 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -245,9 +245,9 @@
SharedPreferences.Editor editor = pref.edit();
if (version == 0) {
- // For old version, change 1 to -1 for video duration preference.
+ // For old version, change 1 to 10 for video duration preference.
if (pref.getString(KEY_VIDEO_DURATION, "1").equals("1")) {
- editor.putString(KEY_VIDEO_DURATION, "-1");
+ editor.putString(KEY_VIDEO_DURATION, "10");
}
}
editor.putInt(KEY_VERSION, CURRENT_VERSION);