diff --git a/src/android/customCamera/res/drawable-hdpi/ic_launcher.png b/src/android/customCamera/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..288b665 Binary files /dev/null and b/src/android/customCamera/res/drawable-hdpi/ic_launcher.png differ diff --git a/src/android/customCamera/res/drawable-mdpi/ic_launcher.png b/src/android/customCamera/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..6ae570b Binary files /dev/null and b/src/android/customCamera/res/drawable-mdpi/ic_launcher.png differ diff --git a/src/android/customCamera/res/drawable-xhdpi/ic_launcher.png b/src/android/customCamera/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..d4fb7cd Binary files /dev/null and b/src/android/customCamera/res/drawable-xhdpi/ic_launcher.png differ diff --git a/src/android/customCamera/res/drawable-xxhdpi/ic_launcher.png b/src/android/customCamera/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..85a6081 Binary files /dev/null and b/src/android/customCamera/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java index e8a2850..ac1afe5 100644 --- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java +++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java @@ -204,8 +204,8 @@ public class CameraActivity extends Activity { final int heightScreen = dm.heightPixels; FrameLayout cameraPreview = (FrameLayout) findViewById(R.id.camera_preview); - LayoutParams paramsCameraPreview = - (LayoutParams) cameraPreview.getLayoutParams(); + RelativeLayout.LayoutParams paramsCameraPreview = + new RelativeLayout.LayoutParams(cameraPreview.getLayoutParams()); Size camParameters = customCamera.getParameters().getPictureSize(); @@ -221,13 +221,17 @@ public class CameraActivity extends Activity { float ratio; if (widthScreen > heightScreen) { - paramsCameraPreview.height = LayoutParams.FILL_PARENT; - ratio = ( (float)minSize / (float)heightScreen ); - paramsCameraPreview.width = (int)(maxSize / ratio); + paramsCameraPreview.height = LayoutParams.FILL_PARENT; + ratio = ( (float)minSize / (float)heightScreen ); + paramsCameraPreview.width = (int)(maxSize / ratio); + int marginLeft = (int) (((float)(widthScreen - paramsCameraPreview.width)) / 2); + paramsCameraPreview.setMargins(marginLeft, 0, 0, 0); } else { paramsCameraPreview.width = LayoutParams.FILL_PARENT; - ratio = ( (float)minSize / (float)widthScreen ); + ratio = ( (float)minSize / (float)widthScreen ); paramsCameraPreview.height = (int)(maxSize / ratio); + int marginTop = (int) (((float)(heightScreen - paramsCameraPreview.height)) / 2); + paramsCameraPreview.setMargins(0, marginTop, 0, 0); } cameraPreview.setLayoutParams(paramsCameraPreview);