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 2014-09-11 14:35:55 +02:00
commit ddd9f00f11
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -289,8 +289,8 @@ public class MapInfoLayer extends OsmandMapLayer {
statusBar.setLayoutParams(flp);
flp = new FrameLayout.LayoutParams((int)(78 * scaleCoefficient),
(int)(78 * scaleCoefficient), Gravity.RIGHT | Gravity.BOTTOM);
flp.rightMargin = (int) (10*scaleCoefficient);
(int)(78 * scaleCoefficient), Gravity.LEFT | Gravity.BOTTOM);
flp.leftMargin = (int) (10*scaleCoefficient);
flp.bottomMargin = (int) (85*scaleCoefficient);
alarmControl.setLayoutParams(flp);

4
OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
View file

@ -687,8 +687,8 @@ public class RouteInfoWidgetsFactory {
locimgId = R.drawable.warnings_speed_bump;
text = "";
} else if(alarm.getType() == AlarmInfoType.STOP) {
// text = "STOP";
text = "";
text = "STOP";
//text = "";
}
visible = (text != null && text.length() > 0) || locimgId != 0;
if (visible) {