summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-05-01 18:32:14 -0400
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:47 +0200
commitf4f4879694fdcf59a75942ddd6fd98d87d0b13e9 (patch)
tree31bf1118dd4fe02fd9d165502906b51c8bd69e2b
parent3d254b3b464873188fdd61481c99fd2f5b00c090 (diff)
downloadandroid_packages_apps_Snap-f4f4879694fdcf59a75942ddd6fd98d87d0b13e9.tar.gz
android_packages_apps_Snap-f4f4879694fdcf59a75942ddd6fd98d87d0b13e9.tar.bz2
android_packages_apps_Snap-f4f4879694fdcf59a75942ddd6fd98d87d0b13e9.zip
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 ac6dc58c2..8f0f55908 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) {