summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSultanxda <sultanxda@gmail.com>2015-12-08 18:51:56 -0800
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:08:17 +0100
commit8bfc0856b8be1af3bd9ccb6df1d474ac14c0cc3d (patch)
treeab7af8eee90f9b827297a20982ce1f69682ce28b
parent24772dad947b042f89fb12d9d47ebfa4671edc14 (diff)
downloadandroid_packages_apps_Snap-8bfc0856b8be1af3bd9ccb6df1d474ac14c0cc3d.zip
android_packages_apps_Snap-8bfc0856b8be1af3bd9ccb6df1d474ac14c0cc3d.tar.gz
android_packages_apps_Snap-8bfc0856b8be1af3bd9ccb6df1d474ac14c0cc3d.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 5b8ddf3..1f79922 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -111,6 +111,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 56bcfcb..da84cae 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -191,7 +191,7 @@
camera:entryValues="@array/pref_video_focusmode_entryvalues" />
<ListPreference
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:entries="@array/pref_camera_focustime_duration_entries"
camera:entryValues="@array/pref_camera_focustime_duration_values" />
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index c72939b..507627f 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2842,7 +2842,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))));
// Set face detetction parameter.
String faceDetection = mPreferences.getString(