Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-08 09:31:07 +01:00
commit 4bf21bf77f

View file

@ -565,7 +565,7 @@ public class MapActivityActions implements DialogProvider {
return true; return true;
} }
}).reg(); }).reg();
optionsMenuHelper.item(R.string.target_points).iconColor(R.drawable.ic_action_flage_dark) optionsMenuHelper.item(R.string.waypoints).iconColor(R.drawable.ic_action_flage_dark)
.listen(new OnContextMenuClick() { .listen(new OnContextMenuClick() {
@Override @Override
public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) { public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {