Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
b46ad14c18
3 changed files with 6 additions and 1 deletions
|
@ -95,7 +95,6 @@ public class GeocodingUtilities {
|
|||
this.building = r.building;
|
||||
this.city = r.city;
|
||||
this.street = r.street;
|
||||
this.streetName = r.streetName;
|
||||
}
|
||||
|
||||
// input
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
|
||||
-->
|
||||
|
||||
<string name="shared_string_near">Near</string>
|
||||
<string name="shared_string_hide">Hide</string>
|
||||
<string name="av_video_quality_low">Lowest resolution</string>
|
||||
<string name="av_video_quality_high">Highest resolution</string>
|
||||
|
|
|
@ -171,6 +171,11 @@ public abstract class MenuTitleController {
|
|||
}
|
||||
|
||||
streetStr = geocodingResult;
|
||||
|
||||
if (!Algorithms.isEmpty(streetStr) && object.getDistance() > 100) {
|
||||
streetStr = getMapActivity().getString(R.string.shared_string_near)+" " +streetStr
|
||||
}
|
||||
|
||||
if (!Algorithms.isEmpty(streetStr)) {
|
||||
MenuController menuController = getMenuController();
|
||||
if (menuController == null || menuController.displayStreetNameInTitle()) {
|
||||
|
|
Loading…
Reference in a new issue