Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-10-29 14:35:45 +01:00
commit d6037d9f45
4 changed files with 5 additions and 5 deletions

View file

@ -424,7 +424,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
} }
}; };
adapter.item(R.string.layer_recordings).selected(SHOW_RECORDINGS.get() ? 1 : 0) adapter.item(R.string.layer_recordings).selected(SHOW_RECORDINGS.get() ? 1 : 0)
.icons(R.drawable.ic_action_audio_dark, R.drawable.ic_action_audio_light).listen(listener).position(6).reg(); .icons(R.drawable.ic_action_audio_dark, R.drawable.ic_action_audio_light).listen(listener).position(12).reg();
} }
@Override @Override

View file

@ -164,7 +164,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
} }
return true; return true;
} }
}).position(7).reg(); }).position(16).reg();
} }

View file

@ -212,9 +212,9 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
adapter.item(R.string.layer_map).icons(R.drawable.ic_action_globus_dark, R.drawable.ic_action_globus_light) adapter.item(R.string.layer_map).icons(R.drawable.ic_action_globus_dark, R.drawable.ic_action_globus_light)
.listen(listener).position(0).reg(); .listen(listener).position(0).reg();
adapter.item(R.string.layer_overlay).selected(overlayLayer.getMap() != null ? 1 : 0). adapter.item(R.string.layer_overlay).selected(overlayLayer.getMap() != null ? 1 : 0).
icons(R.drawable.ic_action_up_dark, R.drawable.ic_action_up_light).listen(listener).position(10).reg(); icons(R.drawable.ic_action_up_dark, R.drawable.ic_action_up_light).listen(listener).position(14).reg();
adapter.item(R.string.layer_underlay).selected(underlayLayer.getMap() != null ? 1 : 0) adapter.item(R.string.layer_underlay).selected(underlayLayer.getMap() != null ? 1 : 0)
.icons(R.drawable.ic_action_down_dark, R.drawable.ic_action_down_light).listen(listener).position(11).reg(); .icons(R.drawable.ic_action_down_dark, R.drawable.ic_action_down_light).listen(listener).position(15).reg();
} }

View file

@ -104,7 +104,7 @@ public class SRTMPlugin extends OsmandPlugin {
} }
}; };
adapter.item(R.string.layer_hillshade).selected(HILLSHADE.get()? 1 : 0) adapter.item(R.string.layer_hillshade).selected(HILLSHADE.get()? 1 : 0)
.icons( R.drawable.ic_action_hillshade_dark, R.drawable.ic_action_hillshade_light).listen(listener).position(9).layout(R.layout.drawer_list_item).reg(); .icons( R.drawable.ic_action_hillshade_dark, R.drawable.ic_action_hillshade_light).listen(listener).position(13).layout(R.layout.drawer_list_item).reg();
} }
@Override @Override