Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-06 10:41:34 +01:00
commit b8f7f99fea
2 changed files with 2 additions and 0 deletions

View file

@ -369,6 +369,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
settings.setBuiltInZoomControls(true);
settings.setDisplayZoomControls(false);
settings.setSupportZoom(true);
wv.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
wv.loadDataWithBaseURL(null, content, "text/html", "UTF-8", null);
// wv.loadUrl(OsMoService.SIGN_IN_URL + app.getSettings().OSMO_DEVICE_KEY.get());

View file

@ -105,6 +105,7 @@ public class ContextMenuHelper {
settings.setBuiltInZoomControls(true);
settings.setDisplayZoomControls(false);
settings.setSupportZoom(true);
wv.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
wv.loadDataWithBaseURL(null, content, "text/html", "UTF-8", null);
// wv.loadUrl(OsMoService.SIGN_IN_URL + app.getSettings().OSMO_DEVICE_KEY.get());