diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-01-13 18:25:29 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-02-07 15:05:15 -0800 |
| commit | fe6984064d0546d113d88107311719c5b4e7ab40 (patch) | |
| tree | 2b8ef6942bb7fdb17b6eaad0095e8af7d5a5e760 | |
| parent | 8ab0ea01944dea717cfbc61a37c47c62eee33f88 (diff) | |
| download | android_packages_apps_Snap-fe6984064d0546d113d88107311719c5b4e7ab40.tar.gz android_packages_apps_Snap-fe6984064d0546d113d88107311719c5b4e7ab40.tar.bz2 android_packages_apps_Snap-fe6984064d0546d113d88107311719c5b4e7ab40.zip | |
Snap: Add focus time support in camcorder
Change-Id: I5432554a40d7375ed7893c38cb2741a12cc8cc80
| -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 0ce03a175..48d192d3e 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -173,6 +173,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_camera_antibanding_key" camera:defaultValue="@string/pref_camera_antibanding_default" camera:title="@string/pref_camera_antibanding_title" diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 94829c268..fb1048bd5 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -60,6 +60,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 c5349004c..81a85b921 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -110,6 +110,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, @@ -122,6 +123,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 e617ab243..c1f7eb90b 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2529,6 +2529,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)))); } @SuppressWarnings("deprecation") |