summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values/qcomstrings.xml4
-rw-r--r--src/com/android/camera/VideoMenu.java3
2 files changed, 3 insertions, 4 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 888000c36..7812c8b32 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -277,7 +277,7 @@
<string name="pref_camera_cds_default" translatable="false">on</string>
<!-- Default video cds mode setting-->
- <string name="pref_camera_video_cds_default" translatable="false">on</string>
+ <string name="pref_camera_video_cds_default" translatable="false">off</string>
<!-- Settings menu, setting title text for tnr mode-->
<string name="pref_camera_tnr_title">TNR mode</string>
@@ -289,7 +289,7 @@
<string name="pref_camera_tnr_default" translatable="false">off</string>
<!-- Default video tnr mode setting-->
- <string name="pref_camera_video_tnr_default" translatable="false">off</string>
+ <string name="pref_camera_video_tnr_default" translatable="false">on</string>
<!-- Default face detection setting. -->
<string name="pref_camera_facedetection_default" translatable="false">off</string>
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 302dd47f0..670572774 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -729,8 +729,7 @@ public class VideoMenu extends MenuController
mPrevSavedVideoCDS = cds;
}
- if ((tnr != null) && !mActivity.getString(R.string.
- pref_camera_video_tnr_default).equals(tnr)) {
+ if ((tnr != null) && !tnr.equals("off")) {
mListMenu.setPreferenceEnabled(
CameraSettings.KEY_VIDEO_CDS_MODE,false);
mListMenu.overrideSettings(