Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove non-functional zooming

Browse source
This commit is contained in:
sonora 2017-01-06 15:25:25 +01:00
parent 2e9a633858
commit 686d94d908
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -366,11 +366,13 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
final WebView wv = new WebView(ctx); final WebView wv = new WebView(ctx);
WebSettings settings = wv.getSettings(); WebSettings settings = wv.getSettings();
settings.setDefaultTextEncodingName("utf-8"); settings.setDefaultTextEncodingName("utf-8");
settings.setBuiltInZoomControls(true);
//Zooming does not work ok here
settings.setBuiltInZoomControls(false);
settings.setDisplayZoomControls(false); settings.setDisplayZoomControls(false);
settings.setSupportZoom(true);
//Scale web view font size with system font size
if (android.os.Build.VERSION.SDK_INT >= 14) { if (android.os.Build.VERSION.SDK_INT >= 14) {
//Scale web view font size with system font size
settings.setTextZoom((int) (ctx.getResources().getDisplayMetrics().density * 100f)); settings.setTextZoom((int) (ctx.getResources().getDisplayMetrics().density * 100f));
} else { } else {
if (ctx.getResources().getDisplayMetrics().density <= 0.5f) { if (ctx.getResources().getDisplayMetrics().density <= 0.5f) {

8
OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java
View file

@ -102,11 +102,13 @@ public class ContextMenuHelper {
final WebView wv = new WebView(ctx); final WebView wv = new WebView(ctx);
WebSettings settings = wv.getSettings(); WebSettings settings = wv.getSettings();
settings.setDefaultTextEncodingName("utf-8"); settings.setDefaultTextEncodingName("utf-8");
settings.setBuiltInZoomControls(true);
//Zooming does not work ok here
settings.setBuiltInZoomControls(false);
settings.setDisplayZoomControls(false); settings.setDisplayZoomControls(false);
settings.setSupportZoom(true);
//Scale web view font size with system font size
if (android.os.Build.VERSION.SDK_INT >= 14) { if (android.os.Build.VERSION.SDK_INT >= 14) {
//Scale web view font size with system font size
settings.setTextZoom((int) (ctx.getResources().getDisplayMetrics().density * 100f)); settings.setTextZoom((int) (ctx.getResources().getDisplayMetrics().density * 100f));
} else { } else {
if (ctx.getResources().getDisplayMetrics().density <= 0.5f) { if (ctx.getResources().getDisplayMetrics().density <= 0.5f) {