Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-11 20:24:10 +01:00
commit 40a0e1efe7

View file

@ -163,14 +163,6 @@ public class QuickActionFactory {
} }
quickActions.add(new QuickAction(0, R.string.quick_action_add_configure_map)); quickActions.add(new QuickAction(0, R.string.quick_action_add_configure_map));
quickActions.add(new MapStyleAction());
if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {
quickActions.add(new MapSourceAction());
quickActions.add(new MapOverlayAction());
quickActions.add(new MapUnderlayAction());
}
QuickAction favorites = new ShowHideFavoritesAction(); QuickAction favorites = new ShowHideFavoritesAction();
@ -180,6 +172,15 @@ public class QuickActionFactory {
quickActions.add(new ShowHidePoiAction()); quickActions.add(new ShowHidePoiAction());
quickActions.add(new MapStyleAction());
if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {
quickActions.add(new MapSourceAction());
quickActions.add(new MapOverlayAction());
quickActions.add(new MapUnderlayAction());
}
QuickAction voice = new NavigationVoiceAction(); QuickAction voice = new NavigationVoiceAction();
if (!voice.hasInstanceInList(active)) { if (!voice.hasInstanceInList(active)) {