diff options
| -rw-r--r-- | res/xml/video_preferences.xml | 7 | ||||
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/VideoMenu.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 5 |
4 files changed, 15 insertions, 0 deletions
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 2d148163c..a943b3285 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -202,6 +202,13 @@ camera:entries="@array/pref_video_focusmode_entries" camera:entryValues="@array/pref_video_focusmode_entryvalues" /> <IconListPreference + camera:key="pref_camera_video_focustime_key" + camera:defaultValue="@string/pref_camera_focustime_default" + camera:title="@string/pref_camera_focustime_title" + camera:singleIcon="@drawable/ic_settings_focus_time" + camera:entries="@array/pref_camera_focustime_duration_entries" + camera:entryValues="@array/pref_camera_focustime_duration_values" /> + <IconListPreference camera:key="pref_power_shutter" camera:defaultValue="@string/pref_camera_power_shutter_default" camera:title="@string/pref_camera_power_shutter_title" diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index b302e8a57..c33151556 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -63,6 +63,7 @@ public class CameraSettings { public static final String KEY_FOCUS_MODE = "pref_camera_focusmode_key"; public static final String KEY_VIDEOCAMERA_FOCUS_MODE = "pref_camera_video_focusmode_key"; public static final String KEY_FOCUS_TIME = "pref_camera_focustime_key"; + public static final String KEY_VIDEOCAMERA_FOCUS_TIME = "pref_camera_video_focustime_key"; public static final String KEY_FLASH_MODE = "pref_camera_flashmode_key"; public static final String KEY_VIDEOCAMERA_FLASH_MODE = "pref_camera_video_flashmode_key"; public static final String KEY_WHITE_BALANCE = "pref_camera_whitebalance_key"; diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 1d55f20d7..f3dcda4b9 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -113,6 +113,7 @@ public class VideoMenu extends MenuController CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, CameraSettings.KEY_VIDEO_QUALITY, CameraSettings.KEY_VIDEOCAMERA_FOCUS_MODE, + CameraSettings.KEY_VIDEOCAMERA_FOCUS_TIME, CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_CAMERA_SAVEPATH, CameraSettings.KEY_EXPOSURE, @@ -126,6 +127,7 @@ public class VideoMenu extends MenuController CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, CameraSettings.KEY_VIDEO_QUALITY, CameraSettings.KEY_VIDEOCAMERA_FOCUS_MODE, + CameraSettings.KEY_VIDEOCAMERA_FOCUS_TIME, CameraSettings.KEY_RECORD_LOCATION, CameraSettings.KEY_CAMERA_SAVEPATH, CameraSettings.KEY_EXPOSURE, diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index e4ec96bd8..fd7809a9a 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2769,6 +2769,11 @@ public class VideoModule implements CameraModule, // Set focus mode mParameters.setFocusMode(mFocusManager.getFocusMode(true)); + // Set focus time. + mFocusManager.setFocusTime(Integer.valueOf( + mPreferences.getString(CameraSettings.KEY_VIDEOCAMERA_FOCUS_TIME, + mActivity.getString(R.string.pref_camera_focustime_default)))); + // Set face detetction parameter. String faceDetection = mPreferences.getString( CameraSettings.KEY_FACE_DETECTION, |