diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 5a41113..861c8cf 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -13,7 +13,9 @@
+ android:layout_height="fill_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true" >
-
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:gravity="bottom" >
-
+
-
+
-
+
+
-
-
-
-
-
-
-
-
-
+ android:layout_height="match_parent" >
@@ -96,7 +87,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/acceptePicture" />
-
+
-
-
+
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index c7f9e41..e3bb7d8 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -27,7 +27,6 @@ import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
@@ -184,13 +183,15 @@ 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);
mCamera.setParameters(params);
@@ -203,12 +204,14 @@ public class CameraActivity extends Activity {
* @param Parameters params Camera's parameter.
*/
public void handleFocus(MotionEvent event, Camera.Parameters params) {
- List supportedFocusModes = params.getSupportedFocusModes();
- if (supportedFocusModes != null && supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
- mCamera.autoFocus(new Camera.AutoFocusCallback() {
- @Override
- public void onAutoFocus(boolean b, Camera camera) {}
- });
+ if (photoTaken == false) {
+ List supportedFocusModes = params.getSupportedFocusModes();
+ if (supportedFocusModes != null && supportedFocusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
+ mCamera.autoFocus(new Camera.AutoFocusCallback() {
+ @Override
+ public void onAutoFocus(boolean b, Camera camera) {}
+ });
+ }
}
}
@@ -253,8 +256,6 @@ public class CameraActivity extends Activity {
paramsReagrandissement.width = -1;
paramsReagrandissement.height = -1;
imageView.setLayoutParams(paramsReagrandissement);
-
- // imageView.setAlpha(imageView.getAlpha());
miniature.setVisibility(View.VISIBLE);
}
});
@@ -318,7 +319,6 @@ public class CameraActivity extends Activity {
*/
public void onPictureTaken(final byte[] data, Camera camera) {
// Show buttons to accept or decline the picture.
-
final LinearLayout keepPhoto = (LinearLayout) findViewById(R.id.keepPhoto);
keepPhoto.setVisibility(View.VISIBLE);
Button accept = (Button)findViewById(R.id.accept);
@@ -330,9 +330,8 @@ public class CameraActivity extends Activity {
// Put button miniature at the top of the page
final Button miniature = (Button)findViewById(R.id.miniature);
- final LayoutParams params = (RelativeLayout.LayoutParams)miniature.getLayoutParams();
- ((RelativeLayout.LayoutParams) params).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 0);
- ((RelativeLayout.LayoutParams) params).addRule(RelativeLayout.ALIGN_PARENT_TOP, RelativeLayout.TRUE);
+ final LayoutParams params = (LinearLayout.LayoutParams)miniature.getLayoutParams();
+ ((LinearLayout.LayoutParams) params).gravity = Gravity.TOP;
miniature.setLayoutParams(params);
photoTaken = true;
@@ -375,8 +374,7 @@ public class CameraActivity extends Activity {
@Override
public void onClick(View v) {
photoTaken = false;
- ((RelativeLayout.LayoutParams) params).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, RelativeLayout.TRUE);
- ((RelativeLayout.LayoutParams) params).addRule(RelativeLayout.ALIGN_PARENT_TOP, 0);
+ ((LinearLayout.LayoutParams) params).gravity = Gravity.BOTTOM;
miniature.setLayoutParams(params);
// If mode miniature and photo is declined, the miniature goes back to the bottom