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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-01-07 15:51:51 +01:00
commit f1b60d2f85
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -370,9 +370,9 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
WebSettings settings = wv.getSettings(); WebSettings settings = wv.getSettings();
settings.setDefaultTextEncodingName("utf-8"); settings.setDefaultTextEncodingName("utf-8");
//Zooming does not work ok here settings.setBuiltInZoomControls(true);
settings.setBuiltInZoomControls(false);
settings.setDisplayZoomControls(false); settings.setDisplayZoomControls(false);
settings.setSupportZoom(true);
//Scale web view font size with system font size //Scale web view font size with system font size
float scale = ctx.getResources().getConfiguration().fontScale; float scale = ctx.getResources().getConfiguration().fontScale;
@ -400,7 +400,10 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
lp.weight = 1; lp.weight = 1;
ll.addView(scrollView, lp); ll.addView(scrollView, lp);
ll.addView(bottomBar, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); ll.addView(bottomBar, new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
//TODO: ScrollView gets in the way of the pinch gesture here, take wv outside
scrollView.addView(wv); scrollView.addView(wv);
dialog.setContentView(ll); dialog.setContentView(ll);
wv.setFocusable(true); wv.setFocusable(true);
wv.setFocusableInTouchMode(true); wv.setFocusableInTouchMode(true);