Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-08-17 08:15:09 +02:00
commit 285e8a8ae7

View file

@ -376,6 +376,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
settings.setDefaultTextEncodingName("utf-8"); settings.setDefaultTextEncodingName("utf-8");
settings.setBuiltInZoomControls(true); settings.setBuiltInZoomControls(true);
settings.setDisplayZoomControls(false); settings.setDisplayZoomControls(false);
settings.setSupportZoom(true);
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());