summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-12-08 18:51:56 -0800
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-07 15:06:10 -0800
commit26b9e71f91b9cf1647c9b5870d322b709bb0340f (patch)
treee63eb54b041b217afda3112227b4a7c4dcfb0224
parentfccd1672f53a30718d164557d6302d5c61b22225 (diff)
downloadandroid_packages_apps_Snap-26b9e71f91b9cf1647c9b5870d322b709bb0340f.zip
android_packages_apps_Snap-26b9e71f91b9cf1647c9b5870d322b709bb0340f.tar.gz
android_packages_apps_Snap-26b9e71f91b9cf1647c9b5870d322b709bb0340f.tar.bz2
Snap: Separate default focus time between camera/video
For the camera, the user expects a default tap-to-focus duration of 3 seconds with exposure locking. For the camcorder, however, the user expects a tap-to-focus duration of 0 seconds with no exposure locking, as the rapid change in exposure while recording would negatively impact the video. Separate the tap-to-focus option to reflect the recommended defaults. [mikeioannina]: Adapted to Snap Change-Id: I75bc0610f5d301c9728b4bc104b86e0fab5493fb Signed-off-by: Sultanxda <sultanxda@gmail.com>
-rw-r--r--res/values/cm_strings.xml1
-rw-r--r--res/xml/video_preferences.xml2
-rw-r--r--src/com/android/camera/VideoModule.java2
3 files changed, 3 insertions, 2 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index be2d328..5ec63f3 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -199,6 +199,7 @@
<!-- Touch focus duration -->
<string name="pref_camera_focustime_title">Touch focus duration</string>
<string name="pref_camera_focustime_default" translatable="false">3000</string>
+ <string name="pref_camera_video_focustime_default" translatable="false">200</string>
<string name="pref_camera_focustime_entry_0">0s</string>
<string name="pref_camera_focustime_entry_3">3s</string>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 48d192d..564aced 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -174,7 +174,7 @@
camera:entryValues="@array/pref_video_focusmode_entryvalues" />
<IconListPreference
camera:key="pref_camera_video_focustime_key"
- camera:defaultValue="@string/pref_camera_focustime_default"
+ camera:defaultValue="@string/pref_camera_video_focustime_default"
camera:title="@string/pref_camera_focustime_title"
camera:singleIcon="@drawable/ic_settings_focus_time"
camera:entries="@array/pref_camera_focustime_duration_entries"
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index c1f7eb9..39f54b9 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2533,7 +2533,7 @@ public class VideoModule implements CameraModule,
// Set focus time.
mFocusManager.setFocusTime(Integer.valueOf(
mPreferences.getString(CameraSettings.KEY_VIDEOCAMERA_FOCUS_TIME,
- mActivity.getString(R.string.pref_camera_focustime_default))));
+ mActivity.getString(R.string.pref_camera_video_focustime_default))));
}
@SuppressWarnings("deprecation")