diff options
author | Michael Kolb <kolby@google.com> | 2013-07-12 11:36:47 -0700 |
---|---|---|
committer | Alan Newberger <alann@google.com> | 2013-12-02 15:31:01 -0800 |
commit | 7993f4521011869a794da69e4d0057fe3b0886c3 (patch) | |
tree | 34d20a0c812e9e5945e55cfc3729ebb25ad0ac72 | |
parent | 88f9b3e75c313d181c49ac644930627c40b2138d (diff) | |
download | android_packages_apps_Snap-7993f4521011869a794da69e4d0057fe3b0886c3.tar.gz android_packages_apps_Snap-7993f4521011869a794da69e4d0057fe3b0886c3.tar.bz2 android_packages_apps_Snap-7993f4521011869a794da69e4d0057fe3b0886c3.zip |
Always set focus mode first before applying scene mode
cherrypick from Bryce branch
Bug: 9577903
Bug: 11777611
Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 4 |
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); |