Merge branch 'master' of https://github.com/osmandapp/Osmand
This commit is contained in:
commit
f65de68c68
1 changed files with 3 additions and 2 deletions
|
@ -1143,7 +1143,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
|
||||||
parameters.setPictureSize(selectedCamPicSize.width, selectedCamPicSize.height);
|
parameters.setPictureSize(selectedCamPicSize.width, selectedCamPicSize.height);
|
||||||
log.debug("takePhotoWithCamera() set Picture size: width=" + selectedCamPicSize.width
|
log.debug("takePhotoWithCamera() set Picture size: width=" + selectedCamPicSize.width
|
||||||
+ " height=" + selectedCamPicSize.height);
|
+ " height=" + selectedCamPicSize.height);
|
||||||
|
/*
|
||||||
// camera focus type
|
// camera focus type
|
||||||
autofocus = true;
|
autofocus = true;
|
||||||
parameters.setGpsLatitude(lat);
|
parameters.setGpsLatitude(lat);
|
||||||
|
@ -1186,7 +1186,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
|
||||||
&& parameters.getSupportedFlashModes().contains(Parameters.FLASH_MODE_AUTO)) {
|
&& parameters.getSupportedFlashModes().contains(Parameters.FLASH_MODE_AUTO)) {
|
||||||
parameters.setFlashMode(Parameters.FLASH_MODE_AUTO);
|
parameters.setFlashMode(Parameters.FLASH_MODE_AUTO);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
autofocus = false;
|
||||||
int cameraOrientation = getCamOrientation(mapActivity, Camera.CameraInfo.CAMERA_FACING_BACK);
|
int cameraOrientation = getCamOrientation(mapActivity, Camera.CameraInfo.CAMERA_FACING_BACK);
|
||||||
//cam.setDisplayOrientation(cameraOrientation);
|
//cam.setDisplayOrientation(cameraOrientation);
|
||||||
parameters.set("rotation", cameraOrientation);
|
parameters.set("rotation", cameraOrientation);
|
||||||
|
|
Loading…
Reference in a new issue