diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml index d30012865a..b8c65c032e 100644 --- a/OsmAnd/res/values-large/sizes.xml +++ b/OsmAnd/res/values-large/sizes.xml @@ -22,12 +22,12 @@ 120dp 6dp 84dp - 116dp + 138dp 12dp 35sp 30dp 22sp - 12sp + 18sp 131dp 81dp diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml index d3eb9bf16d..ebefb8942f 100644 --- a/OsmAnd/res/values/sizes.xml +++ b/OsmAnd/res/values/sizes.xml @@ -114,7 +114,7 @@ 120dp 9dp - 78dp + 92dp 8dp @@ -148,7 +148,7 @@ 25sp 20dp 16sp - 8sp + 12sp 1sp 3sp 2dp diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java index 7ee0d1c4c6..06e5838c73 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java @@ -1252,6 +1252,7 @@ public class RouteInfoWidgetsFactory { private int imgId; private String cachedText; private String cachedBottomText; + private OsmandSettings.DrivingRegion cachedRegion; public AlarmWidget(final OsmandApplication app, MapActivity ma) { layout = ma.findViewById(R.id.map_alarm_warning); @@ -1366,7 +1367,7 @@ public class RouteInfoWidgetsFactory { icon.setImageResource(locimgId); } Resources res = layout.getContext().getResources(); - if (!Algorithms.objectEquals(text, cachedText)) { + if (!Algorithms.objectEquals(text, cachedText) || cachedRegion != region) { cachedText = text; widgetText.setText(cachedText); if (alarm.getType() == AlarmInfoType.SPEED_LIMIT && americanType && !isCanadianRegion) { @@ -1376,9 +1377,10 @@ public class RouteInfoWidgetsFactory { widgetText.setPadding(0, 0, 0, 0); } } - if (!Algorithms.objectEquals(bottomText, cachedBottomText)) { + if (!Algorithms.objectEquals(bottomText, cachedBottomText) || cachedRegion != region) { cachedBottomText = bottomText; widgetBottomText.setText(cachedBottomText); + cachedRegion = region; if (alarm.getType() == AlarmInfoType.SPEED_LIMIT && isCanadianRegion) { int bottomPadding = res.getDimensionPixelSize(R.dimen.map_button_margin); widgetBottomText.setPadding(0, 0, 0, bottomPadding);