Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

shared_string_delete (2)

Browse source
This commit is contained in:
sonora 2015-03-08 17:00:30 +01:00
parent cd6173bdaa
commit 6b673c431f
5 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/values/strings.xml
View file

@ -2122,7 +2122,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="poi_dialog_other_tags_message">All other tags are preserved</string>
<string name="default_buttons_commit">Commit</string>
<string name="filter_current_poiButton">Filter</string>
<string name="edit_filter_delete_menu_item">Delete</string>
<string name="edit_filter_save_as_menu_item">Save As</string>
<string name="edit_filter_delete_dialog_title">Delete selected filter?</string>
<string name="edit_filter_delete_message">Filter {0} has been deleted</string>

2
OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
View file

@ -112,7 +112,7 @@ public class EditPOIFilterActivity extends OsmandListActivity {
//R.drawable.a_1_navigation_accept_light, R.drawable.a_1_navigation_accept_dark,
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT | MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
if(!filter.isStandardFilter()){
createMenuItem(menu, DELETE_FILTER, R.string.edit_filter_delete_menu_item,
createMenuItem(menu, DELETE_FILTER, R.string.shared_string_delete,
R.drawable.ic_action_gdiscard_dark, R.drawable.ic_action_gdiscard_dark,
MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
}

2
OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
View file

@ -143,7 +143,7 @@ public class SearchHistoryFragment extends ListFragment implements SearchActivit
DirectionsDialogs.createDirectionsActionsPopUpMenu(optionsMenu, new LatLon(model.getLat(), model.getLon()),
model, name, settings.getLastKnownMapZoom(), getActivity(), true);
MenuItem item = optionsMenu.getMenu().add(
R.string.edit_filter_delete_menu_item).setIcon(light ?
R.string.shared_string_delete).setIcon(light ?
R.drawable.ic_action_delete_light : R.drawable.ic_action_delete_dark);
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override

2
OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
View file

@ -1139,7 +1139,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
}
});
item = optionsMenu.getMenu().add(R.string.edit_filter_delete_menu_item)
item = optionsMenu.getMenu().add(R.string.shared_string_delete)
.setIcon(light ? R.drawable.ic_action_delete_light : R.drawable.ic_action_delete_dark);
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override

2
OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
View file

@ -1041,7 +1041,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
}
item = optionsMenu.getMenu().add(R.string.edit_filter_delete_menu_item)
item = optionsMenu.getMenu().add(R.string.shared_string_delete)
.setIcon(light ? R.drawable.ic_action_delete_light : R.drawable.ic_action_delete_dark);
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override