From: Nathaniel McCallum <npmccallum@redhat.com>
Date: Tue, 10 Dec 2013 17:39:15 +0000 (-0500)
Subject: Make focus mode selection more flexible
X-Git-Url: http://pileus.org/git/?p=~andy%2Ffreeotp;a=commitdiff_plain;h=96a1198638125e8fff684f1e2df743ccf91fd0e8

Make focus mode selection more flexible
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a1f6d89..b514f4d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,7 +21,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fedorahosted.freeotp"
-    android:versionCode="7"
+    android:versionCode="8"
     android:versionName="1.3" >
 
     <uses-sdk
diff --git a/src/org/fedorahosted/freeotp/CameraDialogFragment.java b/src/org/fedorahosted/freeotp/CameraDialogFragment.java
index f4c7760..c3c23dd 100644
--- a/src/org/fedorahosted/freeotp/CameraDialogFragment.java
+++ b/src/org/fedorahosted/freeotp/CameraDialogFragment.java
@@ -20,6 +20,9 @@
 
 package org.fedorahosted.freeotp;
 
+import java.util.List;
+
+import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -84,6 +87,7 @@ public class CameraDialogFragment extends BaseAlertDialogFragment implements Sur
 	}
 
 	@Override
+	@TargetApi(14)
 	public void surfaceCreated(SurfaceHolder holder) {
 		try {
 			mCamera = Camera.open();
@@ -105,7 +109,13 @@ public class CameraDialogFragment extends BaseAlertDialogFragment implements Sur
 
 			// Set auto-focus mode
 			Parameters params = mCamera.getParameters();
-			params.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
+			List<String> modes = params.getSupportedFocusModes();
+			if (modes.contains(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE))
+				params.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+			else if (modes.contains(Parameters.FOCUS_MODE_CONTINUOUS_VIDEO))
+				params.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
+			else if (modes.contains(Parameters.FOCUS_MODE_AUTO))
+				params.setFocusMode(Parameters.FOCUS_MODE_AUTO);
 			mCamera.setParameters(params);
 		} catch (Exception e) {
 			SurfaceView sv = (SurfaceView) getDialog().findViewById(R.id.camera_surfaceview);
diff --git a/src/org/fedorahosted/freeotp/MainActivity.java b/src/org/fedorahosted/freeotp/MainActivity.java
index 1eb632a..f72386d 100644
--- a/src/org/fedorahosted/freeotp/MainActivity.java
+++ b/src/org/fedorahosted/freeotp/MainActivity.java
@@ -96,8 +96,7 @@ public class MainActivity extends Activity implements OnMenuItemClickListener {
 		case R.id.action_add:
 			// If the device has a camera available, try to scan for QR code
 			PackageManager pm = getPackageManager();
-			if (pm.hasSystemFeature(PackageManager.FEATURE_CAMERA) &&
-				pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_AUTOFOCUS)) {
+			if (pm.hasSystemFeature(PackageManager.FEATURE_CAMERA)) {
 				new CameraDialogFragment().show(getFragmentManager(),
 						CameraDialogFragment.FRAGMENT_TAG);
 			} else {