From c194e571bf96b129cc3d1043443758aa92b62d1f Mon Sep 17 00:00:00 2001
From: Thomas BOY <thomas.boy@geneanet.org>
Date: Mon, 19 Jan 2015 12:02:12 +0100
Subject: [PATCH] =?UTF-8?q?Modification=20des=20fichiers=20apr=C3=A8s=20le?=
 =?UTF-8?q?=20premier=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       | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 8e63563..6d508c1 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/globalLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
     <FrameLayout
         android:id="@+id/camera_preview"
         android:layout_width="fill_parent"
-        android:layout_height="1067dp"
-        android:gravity="center" >
+        android:layout_height="fill_parent" >
     </FrameLayout>
 
     <ImageView
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index ac1afe5..c1fcee9 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -200,8 +200,6 @@ public class CameraActivity extends Activity {
 
     DisplayMetrics dm = new DisplayMetrics();
     getWindowManager().getDefaultDisplay().getMetrics(dm);
-    final int widthScreen = dm.widthPixels;
-    final int heightScreen = dm.heightPixels;
     
     FrameLayout cameraPreview = (FrameLayout) findViewById(R.id.camera_preview);
     RelativeLayout.LayoutParams paramsCameraPreview = 
@@ -218,7 +216,9 @@ public class CameraActivity extends Activity {
       maxSize = camParameters.height;
       minSize = camParameters.width;
     }
-
+    
+    int widthScreen = dm.widthPixels;
+    int heightScreen = dm.heightPixels;
     float ratio;
     if (widthScreen > heightScreen) {
       paramsCameraPreview.height = LayoutParams.FILL_PARENT;