From 04ad452367cc08f70c5996825438cb54a17c21c2 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 11 Aug 2016 15:44:42 +0200 Subject: [PATCH] resolve conflict --- .../plus/views/mapwidgets/MapInfoWidgetsFactory.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java index 4fabdf73f2..96580402df 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java @@ -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 {