Merge branch 'drawer' of ssh://github.com/osmandapp/Osmand into drawer

This commit is contained in:
Victor Shcherb 2014-10-26 16:31:26 +01:00
commit 2ad5ca35b1
2 changed files with 3 additions and 5 deletions

View file

@ -10,8 +10,8 @@
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="rendering_category_details">Details</string>
<string name="rendering_category_transport">Transport</string>
<string name="rendering_category_hiking">Hiking</string>
<string name="rendering_category_routes">Routes</string>
<string name="rendering_category_others">Others map attributes</string>
<string name="map_widget_appearance_rem">Remaining elements</string>
<string name="map_widget_vector_attributes">Rendering attributes</string>

View file

@ -245,11 +245,9 @@ public class ConfigureMapMenu {
RenderingRulesStorage renderer = activity.getMyApplication().getRendererRegistry().getCurrentSelectedRenderer();
if (renderer != null) {
List<RenderingRuleProperty> customRules = new ArrayList<RenderingRuleProperty>(renderer.PROPS.getCustomRules());
createProperties(customRules, R.string.rendering_category_details, "details",
createProperties(customRules, R.string.rendering_category_details, "details",
adapter, activity);
createProperties(customRules, R.string.rendering_category_hiking, "hiking",
adapter, activity);
createProperties(customRules, R.string.rendering_category_transport, "transport",
createProperties(customRules, R.string.rendering_category_transport, "routes",
adapter, activity);
if(customRules.size() > 0) {
adapter.item(R.string.rendering_category_others).setCategory(true).layout(R.layout.drawer_list_sub_header).reg();