summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-12-02 15:52:44 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-02 15:52:44 -0800
commit8850f6d8bf69f6415e7e38448f8ef33824ac67cf (patch)
tree34d20a0c812e9e5945e55cfc3729ebb25ad0ac72
parent3a46bed61f9b64d2b252909563caecfd811dd691 (diff)
parent7993f4521011869a794da69e4d0057fe3b0886c3 (diff)
downloadandroid_packages_apps_Snap-8850f6d8bf69f6415e7e38448f8ef33824ac67cf.tar.gz
android_packages_apps_Snap-8850f6d8bf69f6415e7e38448f8ef33824ac67cf.tar.bz2
android_packages_apps_Snap-8850f6d8bf69f6415e7e38448f8ef33824ac67cf.zip
am 7993f452: Always set focus mode first before applying scene mode
* commit '7993f4521011869a794da69e4d0057fe3b0886c3': Always set focus mode first before applying scene mode
-rw-r--r--src/com/android/camera/PhotoModule.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 9bde1c1b3..2afaf5bf5 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1613,6 +1613,10 @@ public class PhotoModule
setFocusAreasIfSupported();
setMeteringAreasIfSupported();
+ // initialize focus mode
+ mFocusManager.overrideFocusMode(null);
+ mParameters.setFocusMode(mFocusManager.getFocusMode());
+
// Set picture size.
String pictureSize = mPreferences.getString(
CameraSettings.KEY_PICTURE_SIZE, null);