summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-05-01 18:32:14 -0400
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-02-10 08:43:25 -0800
commit2160a59f67d3a9543e1234b50b2255c635d1a721 (patch)
treef4cf14a1a75b04fa2ce7d5043378f74a83740255
parenta5ef60dba5ef073526dfba3f38caf72fec51a411 (diff)
downloadandroid_packages_apps_Snap-2160a59f67d3a9543e1234b50b2255c635d1a721.zip
android_packages_apps_Snap-2160a59f67d3a9543e1234b50b2255c635d1a721.tar.gz
android_packages_apps_Snap-2160a59f67d3a9543e1234b50b2255c635d1a721.tar.bz2
Camera2: Only autofocus before a snap if we are actually in "auto" mode.
Original commit by cyanogen 7daaa72d35c1f8820117768e4b129acd030bcefb Change-Id: I51853913f6459b599176910f7f486f59972eaf36
-rw-r--r--src/com/android/camera/FocusOverlayManager.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 4052377..d248a01 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -568,10 +568,7 @@ public class FocusOverlayManager {
}
private boolean needAutoFocusCall() {
- String focusMode = getFocusMode(false);
- return !(focusMode.equals(Parameters.FOCUS_MODE_INFINITY)
- || focusMode.equals(Parameters.FOCUS_MODE_FIXED)
- || focusMode.equals(Parameters.FOCUS_MODE_EDOF));
+ return getFocusMode(false).equals(Parameters.FOCUS_MODE_AUTO);
}
public void setZslEnable(boolean value) {