From 7d35f193a042090cb7ef8f78c60ecf88f890f0e9 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 28 Jan 2015 16:45:41 +0100 Subject: [PATCH] Keep Settings together --- .../plus/activities/MapActivityActions.java | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index 7a4caf86c3..58766dfede 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -859,16 +859,6 @@ public class MapActivityActions implements DialogProvider { }).reg(); - optionsMenuHelper.item(R.string.configure_map).icons(R.drawable.ic_action_layers_dark, R.drawable.ic_action_layers_light) - .listen(new OnContextMenuClick() { - @Override - public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) { - currentDrawer = DrawerType.CONFIGURE_MAP; - prepareConfigureMap(); - return false; - } - }).reg(); - optionsMenuHelper.item(R.string.show_point_options) .icons(R.drawable.ic_action_marker_dark, R.drawable.ic_action_marker_light) .listen(new OnContextMenuClick() { @@ -878,7 +868,26 @@ public class MapActivityActions implements DialogProvider { return true; } }).reg(); - + + optionsMenuHelper.item(R.string.configure_map).icons(R.drawable.ic_action_layers_dark, R.drawable.ic_action_layers_light) + .listen(new OnContextMenuClick() { + @Override + public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) { + currentDrawer = DrawerType.CONFIGURE_MAP; + prepareConfigureMap(); + return false; + } + }).reg(); + + optionsMenuHelper.item(R.string.layer_map_appearance).icons(R.drawable.ic_configure_screen_dark, R.drawable.ic_configure_screen_light) + .listen(new OnContextMenuClick() { + @Override + public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) { + prepareConfigureScreen(); + return false; + } + }).reg(); + optionsMenuHelper.item(R.string.settings_activity) .icons(R.drawable.ic_action_settings_light, R.drawable.ic_action_settings_dark) .listen(new OnContextMenuClick() { @@ -890,16 +899,6 @@ public class MapActivityActions implements DialogProvider { } }).reg(); - optionsMenuHelper.item(R.string.layer_map_appearance).icons(R.drawable.ic_configure_screen_dark, R.drawable.ic_configure_screen_light) - .listen(new OnContextMenuClick() { - @Override - public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) { - prepareConfigureScreen(); - return false; - } - }).reg(); - - //////////// Others final OsmAndLocationProvider loc = app.getLocationProvider(); // this is development functionality so it should stay preferrably here