Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-10-29 13:06:53 +01:00
commit d9e52cc477

View file

@ -719,14 +719,6 @@ public class MapActivityActions implements DialogProvider {
} }
// 5-9. Default actions (Layers, Configure Map screen, Settings, Search, Favorites) // 5-9. Default actions (Layers, Configure Map screen, Settings, Search, Favorites)
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) {
prepareConfigureMap();
return false;
}
}).reg();
optionsMenuHelper.item(R.string.search_button) optionsMenuHelper.item(R.string.search_button)
.icons(R.drawable.ic_action_search_dark, R.drawable.ic_action_search_light) .icons(R.drawable.ic_action_search_dark, R.drawable.ic_action_search_light)
.listen(new OnContextMenuClick() { .listen(new OnContextMenuClick() {
@ -765,6 +757,15 @@ public class MapActivityActions implements DialogProvider {
} }
}).reg(); }).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) {
prepareConfigureMap();
return false;
}
}).reg();
optionsMenuHelper.item(R.string.layer_map_appearance).icons(R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_light) optionsMenuHelper.item(R.string.layer_map_appearance).icons(R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_light)
.listen(new OnContextMenuClick() { .listen(new OnContextMenuClick() {
@Override @Override