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

resolve conflict

Browse source
This commit is contained in:
sonora 2016-08-11 15:44:42 +02:00
parent 70db7676e8
commit 04ad452367
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -563,15 +563,9 @@ public class MapInfoWidgetsFactory {
settings.SHOW_STREET_NAME.get()) {
RouteDataObject rt = locationProvider.getLastKnownRouteSegment();
if (rt != null) {
<<<<<<< HEAD
text = RoutingHelper.formatStreetName(rt.getName(settings.MAP_PREFERRED_LOCALE.get()),
rt.getRef(), rt.getDestinationName(settings.MAP_PREFERRED_LOCALE.get()), ">");
}
=======
text = RoutingHelper.formatStreetName(rt.getName(settings.MAP_PREFERRED_LOCALE.get()),
rt.getRef(), rt.getDestinationName(settings.MAP_PREFERRED_LOCALE.get()), map.getMyApplication().getString(R.string.towards));
}
>>>>>>> d82263a... Added discount banner
if (text == null) {
text = "";
} else {
@ -608,11 +602,7 @@ public class MapInfoWidgetsFactory {
addressText.setCompoundDrawables(null, null, null, null);
}
}
<<<<<<< HEAD
if (!text.equals(addressText.getText().toString()) && !text.equals("+ " + addressText.getText().toString())) {
=======
if (!text.equals(addressText.getText().toString())) {
>>>>>>> d82263a... Added discount banner
if (!text.equals("")) {
topBar.setContentDescription(text);
} else {