diff options
| author | Sultanxda <sultanxda@gmail.com> | 2015-09-08 21:32:48 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:45 +0200 |
| commit | b82082a43cf3153a0dec9f288d8c358b9b39703a (patch) | |
| tree | 87666890b207c154a970be3b571f91f389d663f3 /src/com/android/camera/FocusOverlayManager.java | |
| parent | 677af41f0ff8c273e6a6bebb999f2baca98c66e5 (diff) | |
| download | android_packages_apps_Snap-b82082a43cf3153a0dec9f288d8c358b9b39703a.tar.gz android_packages_apps_Snap-b82082a43cf3153a0dec9f288d8c358b9b39703a.tar.bz2 android_packages_apps_Snap-b82082a43cf3153a0dec9f288d8c358b9b39703a.zip | |
SnapdragonCamera: Add focus-mode option to camcorder
User can now control the focus mode used while recording video.
Change-Id: I340c01a3f88314de67ca024279672276eff453ed
Signed-off-by: Sultanxda <sultanxda@gmail.com>
Diffstat (limited to 'src/com/android/camera/FocusOverlayManager.java')
| -rw-r--r-- | src/com/android/camera/FocusOverlayManager.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java index 7f72fe9d6..06cdfa86f 100644 --- a/src/com/android/camera/FocusOverlayManager.java +++ b/src/com/android/camera/FocusOverlayManager.java @@ -438,7 +438,7 @@ public class FocusOverlayManager { } } - public String getFocusMode() { + public String getFocusMode(boolean fromVideo) { if (mOverrideFocusMode != null) return mOverrideFocusMode; if (mParameters == null) return Parameters.FOCUS_MODE_AUTO; List<String> supportedFocusModes = mParameters.getSupportedFocusModes(); @@ -448,8 +448,13 @@ public class FocusOverlayManager { mFocusMode = Parameters.FOCUS_MODE_AUTO; } else { // The default is continuous autofocus. - mFocusMode = mPreferences.getString( - CameraSettings.KEY_FOCUS_MODE, null); + if (fromVideo) { + mFocusMode = mPreferences.getString( + CameraSettings.KEY_VIDEOCAMERA_FOCUS_MODE, null); + } else { + mFocusMode = mPreferences.getString( + CameraSettings.KEY_FOCUS_MODE, null); + } // Try to find a supported focus mode from the default list. if (mFocusMode == null) { @@ -549,7 +554,7 @@ public class FocusOverlayManager { } private boolean needAutoFocusCall() { - String focusMode = getFocusMode(); + String focusMode = getFocusMode(false); return !(focusMode.equals(Parameters.FOCUS_MODE_INFINITY) || focusMode.equals(Parameters.FOCUS_MODE_FIXED) || focusMode.equals(Parameters.FOCUS_MODE_EDOF)); |