From a150d5f0e381410781ca5645f3c33634ab1530e2 Mon Sep 17 00:00:00 2001
From: Thomas BOY <thomas.boy@geneanet.org>
Date: Wed, 28 Jan 2015 15:21:38 +0100
Subject: [PATCH] Ajout du flash auto en plus du flash_on et flash_off

---
 .../res/drawable-hdpi/icon_flash_auto.png        | Bin 0 -> 3389 bytes
 .../res/layout/activity_camera_view.xml          |  13 +++++++++++--
 .../geneanet/customcamera/CameraActivity.java    |  11 ++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 src/android/customCamera/res/drawable-hdpi/icon_flash_auto.png

diff --git a/src/android/customCamera/res/drawable-hdpi/icon_flash_auto.png b/src/android/customCamera/res/drawable-hdpi/icon_flash_auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb342f45ee1164e0b5bba2fd9e87a59f6566ad92
GIT binary patch
literal 3389
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
Tak7Gt00000NkvXXu0mjf^af>L

literal 0
HcmV?d00001

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index b0ed095..b0f21dc 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -25,7 +25,7 @@
         android:id="@+id/flash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="60dp"
         android:background="@android:color/transparent"
         android:onClick="enableFlash"
         android:src="@drawable/flash" />
@@ -34,11 +34,20 @@
         android:id="@+id/noFlash"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="60dp"
         android:background="@android:color/transparent"
         android:onClick="enableFlash"
         android:src="@drawable/no_flash" />
 
+    <ImageButton
+        android:id="@+id/flashAuto"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp"
+        android:background="@android:color/transparent"
+        android:onClick="enableFlash"
+        android:src="@drawable/icon_flash_auto" />
+
     <LinearLayout
         android:id="@+id/beforePhoto"
         android:layout_width="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 9ecb8f3..ccd0567 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -866,25 +866,30 @@ public class CameraActivity extends Activity {
    */
   public void enableFlash(View view) {
     ImageButton flash = (ImageButton)findViewById(R.id.flash);
+    ImageButton flashAuto = (ImageButton)findViewById(R.id.flashAuto);
     ImageButton noFlash = (ImageButton)findViewById(R.id.noFlash);
     Camera.Parameters params = customCamera.getParameters();
   
     if (hasFlash()) {
+      flash.setVisibility(View.INVISIBLE);
+      flashAuto.setVisibility(View.INVISIBLE);
+      noFlash.setVisibility(View.INVISIBLE);
       if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_ON)
-          || params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_AUTO)
           || params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_RED_EYE)
           || params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_TORCH)) {
+        params.setFlashMode(Camera.Parameters.FLASH_MODE_AUTO);
+        flashAuto.setVisibility(View.VISIBLE);
+      } else if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_AUTO)) {
         params.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
         noFlash.setVisibility(View.VISIBLE);
-        flash.setVisibility(View.INVISIBLE);
       } else if (params.getFlashMode().equals(Camera.Parameters.FLASH_MODE_OFF)) {
         params.setFlashMode(Camera.Parameters.FLASH_MODE_ON);
-        noFlash.setVisibility(View.INVISIBLE);
         flash.setVisibility(View.VISIBLE);
       }
       customCamera.setParameters(params);
     } else {
       flash.setVisibility(View.INVISIBLE);
+      flashAuto.setVisibility(View.INVISIBLE);
       noFlash.setVisibility(View.INVISIBLE);
     }
   }