Merge pull request #5436 from osmandapp/ContextMenuImprovements

add icon for operator and brand
This commit is contained in:
vshcherb 2018-05-18 23:20:31 +02:00 committed by GitHub
commit ad8991ed0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -469,6 +469,8 @@ public class AmenityMenuBuilder extends MenuBuilder {
iconId = R.drawable.ic_plugin_wikipedia;
} else if (key.equals("addr:housename") || key.equals("whitewater:rapid_name")) {
iconId = R.drawable.ic_action_poi_name;
} else if (key.equals("operator") || key.equals("brand")) {
iconId = R.drawable.ic_action_poi_brand;
} else {
iconId = R.drawable.ic_action_info_dark;
}
@ -492,7 +494,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
textPrefix = "";
}
}
if (icon == null && isText) {
if (icon == null && isText && iconId == 0) {
iconId = R.drawable.ic_action_note_dark;
}
} else {