Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-06 13:07:24 +01:00
commit 8d54485578

View file

@ -369,7 +369,9 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
settings.setBuiltInZoomControls(true); settings.setBuiltInZoomControls(true);
settings.setDisplayZoomControls(false); settings.setDisplayZoomControls(false);
settings.setSupportZoom(true); settings.setSupportZoom(true);
settings.setTextZoom((int) (ctx.getResources().getDisplayMetrics().density * 100f)); if (android.os.Build.VERSION.SDK_INT >= 14) {
settings.setTextZoom((int) (ctx.getResources().getDisplayMetrics().density * 100f));
}
wv.loadDataWithBaseURL(null, content, "text/html", "UTF-8", null); wv.loadDataWithBaseURL(null, content, "text/html", "UTF-8", null);
// wv.loadUrl(OsMoService.SIGN_IN_URL + app.getSettings().OSMO_DEVICE_KEY.get()); // wv.loadUrl(OsMoService.SIGN_IN_URL + app.getSettings().OSMO_DEVICE_KEY.get());