From f27b9d277af1c85615001fbd2290faa99618b832 Mon Sep 17 00:00:00 2001
From: Thomas BOY <thomas.boy@geneanet.org>
Date: Mon, 1 Dec 2014 17:10:27 +0100
Subject: [PATCH] =?UTF-8?q?Modifications=20mineures=20apr=C3=A8s=20premier?=
 =?UTF-8?q?=20pull=20request?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customCamera/res/layout/activity_camera_view.xml   |  4 ++--
 .../src/org/geneanet/customcamera/CameraActivity.java  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index c95228e..861c8cf 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -27,7 +27,7 @@
     </FrameLayout>
 
     <LinearLayout
-        android:id="@+id/linearLayout1"
+        android:id="@+id/beforePhoto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentLeft="true"
@@ -68,7 +68,7 @@
     </LinearLayout>
 
     <FrameLayout
-        android:id="@+id/FrameLayout1"
+        android:id="@+id/afterPhoto"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index a751869..e3bb7d8 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -183,12 +183,14 @@ public class CameraActivity extends Activity {
         
         if (newDist > distanceBetweenFingers) {
             //zoom in
-            if (zoom < maxZoom/2)
+            if (zoom < maxZoom/2) {
                 zoom+=2;
+            }
         } else if (newDist < distanceBetweenFingers) {
             //zoom out
-            if (zoom > 0)
+            if (zoom > 0) {
                 zoom-=2;
+            }
         }
         distanceBetweenFingers = newDist;
         params.setZoom(zoom);
@@ -202,7 +204,7 @@ public class CameraActivity extends Activity {
      * @param Parameters  params Camera's parameter.
      */
     public void handleFocus(MotionEvent event, Camera.Parameters params) {
-        try {
+        if (photoTaken == false) {
 	        List<String> supportedFocusModes = params.getSupportedFocusModes();
 	        if (supportedFocusModes != null && supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
 	            mCamera.autoFocus(new Camera.AutoFocusCallback() {
@@ -210,8 +212,6 @@ public class CameraActivity extends Activity {
 	                public void onAutoFocus(boolean b, Camera camera) {}
 	            });
 	        }
-        } catch (Exception e) {
-            e.printStackTrace();
         }
     }