Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-24 11:15:58 +01:00
commit 06fa7eb6c3

View file

@ -1188,7 +1188,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
cam.setDisplayOrientation(cameraOrientation); cam.setDisplayOrientation(cameraOrientation);
parameters.set("rotation", cameraOrientation); parameters.set("rotation", cameraOrientation);
if (mPreviewSize != null) { if (mPreviewSize != null) {
parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height); //parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
} }
cam.setParameters(parameters); cam.setParameters(parameters);
cam.setPreviewDisplay(holder); cam.setPreviewDisplay(holder);