From 28d68ee56cf65309ea2b14bbb3f4ba5158119e48 Mon Sep 17 00:00:00 2001
From: Christophe Boucaut <cboucaut@geneanet.org>
Date: Fri, 31 Oct 2014 16:42:46 +0100
Subject: [PATCH] Mise en forme du nom du package android.

---
 src/android/AndroidManifest.xml                            | 4 ++--
 src/android/res/layout/activity_camera_view.xml            | 2 +-
 src/android/res/layout/activity_main.xml                   | 2 +-
 .../{testcustomcamera => customcamera}/CameraView.java     | 7 ++++---
 .../{testcustomcamera => customcamera}/MainActivity.java   | 4 +++-
 .../utils/CameraPreview.java                               | 2 +-
 .../utils/CustomCamera.java                                | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)
 rename src/android/src/org/geneanet/{testcustomcamera => customcamera}/CameraView.java (90%)
 rename src/android/src/org/geneanet/{testcustomcamera => customcamera}/MainActivity.java (96%)
 rename src/android/src/org/geneanet/{testcustomcamera => customcamera}/utils/CameraPreview.java (98%)
 rename src/android/src/org/geneanet/{testcustomcamera => customcamera}/utils/CustomCamera.java (95%)

diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml
index 657aba1..34fccf4 100644
--- a/src/android/AndroidManifest.xml
+++ b/src/android/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".MainActivity"
+            android:name="org.geneanet.customcamera.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -23,7 +23,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".CameraView"
+            android:name="org.geneanet.customcamera.CameraView"
             android:label="@string/title_activity_camera_view"
             android:screenOrientation="fullSensor">
         </activity>
diff --git a/src/android/res/layout/activity_camera_view.xml b/src/android/res/layout/activity_camera_view.xml
index acd80d5..338e5b3 100644
--- a/src/android/res/layout/activity_camera_view.xml
+++ b/src/android/res/layout/activity_camera_view.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.geneanet.testcustomcamera.CameraView" >
+    tools:context="org.geneanet.customcamera.CameraView" >
     
     <FrameLayout
     android:id="@+id/camera_preview"
diff --git a/src/android/res/layout/activity_main.xml b/src/android/res/layout/activity_main.xml
index d5a7133..b3250d9 100644
--- a/src/android/res/layout/activity_main.xml
+++ b/src/android/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="org.geneanet.testcustomcamera.MainActivity" >
+    tools:context="org.geneanet.customcamera.MainActivity" >
 
     <TextView
         android:id="@+id/textView1"
diff --git a/src/android/src/org/geneanet/testcustomcamera/CameraView.java b/src/android/src/org/geneanet/customcamera/CameraView.java
similarity index 90%
rename from src/android/src/org/geneanet/testcustomcamera/CameraView.java
rename to src/android/src/org/geneanet/customcamera/CameraView.java
index 5a2e8bb..f3a6b30 100644
--- a/src/android/src/org/geneanet/testcustomcamera/CameraView.java
+++ b/src/android/src/org/geneanet/customcamera/CameraView.java
@@ -1,7 +1,8 @@
-package org.geneanet.testcustomcamera;
+package org.geneanet.customcamera;
 
-import org.geneanet.testcustomcamera.utils.CameraPreview;
-import org.geneanet.testcustomcamera.utils.CustomCamera;
+import org.geneanet.customcamera.utils.CameraPreview;
+import org.geneanet.customcamera.utils.CustomCamera;
+import org.geneanet.testcustomcamera.R;
 
 import android.app.Activity;
 import android.content.res.Configuration;
diff --git a/src/android/src/org/geneanet/testcustomcamera/MainActivity.java b/src/android/src/org/geneanet/customcamera/MainActivity.java
similarity index 96%
rename from src/android/src/org/geneanet/testcustomcamera/MainActivity.java
rename to src/android/src/org/geneanet/customcamera/MainActivity.java
index 67c548f..0502d9f 100644
--- a/src/android/src/org/geneanet/testcustomcamera/MainActivity.java
+++ b/src/android/src/org/geneanet/customcamera/MainActivity.java
@@ -1,4 +1,6 @@
-package org.geneanet.testcustomcamera;
+package org.geneanet.customcamera;
+
+import org.geneanet.testcustomcamera.R;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/android/src/org/geneanet/testcustomcamera/utils/CameraPreview.java b/src/android/src/org/geneanet/customcamera/utils/CameraPreview.java
similarity index 98%
rename from src/android/src/org/geneanet/testcustomcamera/utils/CameraPreview.java
rename to src/android/src/org/geneanet/customcamera/utils/CameraPreview.java
index aae634a..7d57cfe 100644
--- a/src/android/src/org/geneanet/testcustomcamera/utils/CameraPreview.java
+++ b/src/android/src/org/geneanet/customcamera/utils/CameraPreview.java
@@ -1,4 +1,4 @@
-package org.geneanet.testcustomcamera.utils;
+package org.geneanet.customcamera.utils;
 
 import java.io.IOException;
 
diff --git a/src/android/src/org/geneanet/testcustomcamera/utils/CustomCamera.java b/src/android/src/org/geneanet/customcamera/utils/CustomCamera.java
similarity index 95%
rename from src/android/src/org/geneanet/testcustomcamera/utils/CustomCamera.java
rename to src/android/src/org/geneanet/customcamera/utils/CustomCamera.java
index a96cffb..85dd2b9 100644
--- a/src/android/src/org/geneanet/testcustomcamera/utils/CustomCamera.java
+++ b/src/android/src/org/geneanet/customcamera/utils/CustomCamera.java
@@ -1,4 +1,4 @@
-package org.geneanet.testcustomcamera.utils;
+package org.geneanet.customcamera.utils;
 
 import android.hardware.Camera;