diff --git a/OsmAnd/res/drawable-hdpi/ic_action_transparent.png b/OsmAnd/res/drawable-hdpi/ic_action_transparent.png new file mode 100644 index 0000000000..6ab9ec80ce Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_transparent.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_compass.png b/OsmAnd/res/drawable-hdpi/map_compass.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/list_activities_compass.png rename to OsmAnd/res/drawable-hdpi/map_compass.png diff --git a/OsmAnd/res/drawable-hdpi/list_activities_compass_white.png b/OsmAnd/res/drawable-hdpi/map_compass_white.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/list_activities_compass_white.png rename to OsmAnd/res/drawable-hdpi/map_compass_white.png diff --git a/OsmAnd/res/drawable-hdpi/list_activities_config.png b/OsmAnd/res/drawable-hdpi/map_config.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/list_activities_config.png rename to OsmAnd/res/drawable-hdpi/map_config.png diff --git a/OsmAnd/res/drawable-hdpi/list_activities_config_white.png b/OsmAnd/res/drawable-hdpi/map_config_white.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/list_activities_config_white.png rename to OsmAnd/res/drawable-hdpi/map_config_white.png diff --git a/OsmAnd/res/drawable-hdpi/list_activities_globus.png b/OsmAnd/res/drawable-hdpi/map_globus.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/list_activities_globus.png rename to OsmAnd/res/drawable-hdpi/map_globus.png diff --git a/OsmAnd/res/drawable-hdpi/list_activities_globus_white.png b/OsmAnd/res/drawable-hdpi/map_globus_white.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/list_activities_globus_white.png rename to OsmAnd/res/drawable-hdpi/map_globus_white.png diff --git a/OsmAnd/res/drawable-hdpi/list_activities_monitoring.png b/OsmAnd/res/drawable-hdpi/map_monitoring.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/list_activities_monitoring.png rename to OsmAnd/res/drawable-hdpi/map_monitoring.png diff --git a/OsmAnd/res/drawable-hdpi/list_activities_monitoring_white.png b/OsmAnd/res/drawable-hdpi/map_monitoring_white.png similarity index 100% rename from OsmAnd/res/drawable-hdpi/list_activities_monitoring_white.png rename to OsmAnd/res/drawable-hdpi/map_monitoring_white.png diff --git a/OsmAnd/res/drawable-large/list_activities_compass_white.png b/OsmAnd/res/drawable-large/map_activities_compass_white.png similarity index 100% rename from OsmAnd/res/drawable-large/list_activities_compass_white.png rename to OsmAnd/res/drawable-large/map_activities_compass_white.png diff --git a/OsmAnd/res/drawable-large/list_activities_compass.png b/OsmAnd/res/drawable-large/map_compass.png similarity index 100% rename from OsmAnd/res/drawable-large/list_activities_compass.png rename to OsmAnd/res/drawable-large/map_compass.png diff --git a/OsmAnd/res/drawable-large/list_activities_config.png b/OsmAnd/res/drawable-large/map_config.png similarity index 100% rename from OsmAnd/res/drawable-large/list_activities_config.png rename to OsmAnd/res/drawable-large/map_config.png diff --git a/OsmAnd/res/drawable-large/list_activities_config_white.png b/OsmAnd/res/drawable-large/map_config_white.png similarity index 100% rename from OsmAnd/res/drawable-large/list_activities_config_white.png rename to OsmAnd/res/drawable-large/map_config_white.png diff --git a/OsmAnd/res/drawable-large/list_activities_globus.png b/OsmAnd/res/drawable-large/map_globus.png similarity index 100% rename from OsmAnd/res/drawable-large/list_activities_globus.png rename to OsmAnd/res/drawable-large/map_globus.png diff --git a/OsmAnd/res/drawable-large/list_activities_globus_white.png b/OsmAnd/res/drawable-large/map_globus_white.png similarity index 100% rename from OsmAnd/res/drawable-large/list_activities_globus_white.png rename to OsmAnd/res/drawable-large/map_globus_white.png diff --git a/OsmAnd/res/drawable-large/list_activities_monitoring.png b/OsmAnd/res/drawable-large/map_monitoring.png similarity index 100% rename from OsmAnd/res/drawable-large/list_activities_monitoring.png rename to OsmAnd/res/drawable-large/map_monitoring.png diff --git a/OsmAnd/res/drawable-large/list_activities_monitoring_white.png b/OsmAnd/res/drawable-large/map_monitoring_white.png similarity index 100% rename from OsmAnd/res/drawable-large/list_activities_monitoring_white.png rename to OsmAnd/res/drawable-large/map_monitoring_white.png diff --git a/OsmAnd/res/layout/searchpoi.xml b/OsmAnd/res/layout/searchpoi.xml index 4eba592874..0f61b978f4 100644 --- a/OsmAnd/res/layout/searchpoi.xml +++ b/OsmAnd/res/layout/searchpoi.xml @@ -3,17 +3,6 @@ - diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java index 1065912de0..02e773af2e 100644 --- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java +++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java @@ -153,7 +153,7 @@ public class ContextMenuAdapter { if (getImageId(position, holoLight) != 0) { tv.setCompoundDrawablesWithIntrinsicBounds(getImageId(position, holoLight), 0, 0, 0); } else { - tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.list_activities_transparent, 0, 0, 0); + tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_transparent, 0, 0, 0); } tv.setCompoundDrawablePadding(padding); diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java index a10da1d9c2..81a2c9023f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java @@ -321,7 +321,7 @@ public class MapActivityLayers { if(adapter.getImageId(position, light) != 0) { tv.setCompoundDrawablesWithIntrinsicBounds(adapter.getImageId(position, light), 0, 0, 0); } else { - tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.list_activities_transparent, 0, 0, 0); + tv.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_transparent, 0, 0, 0); } tv.setCompoundDrawablePadding(padding); diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index fe37de293d..b16d3d77eb 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -549,7 +549,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa int z = Math.max(16, settings.getLastKnownMapZoom()); MapActivityActions.createDirectionsActions(qa, amenity.getLocation(), amenity, name, z, this, true , null); ActionItem poiDescription = new ActionItem(); - poiDescription.setIcon(getResources().getDrawable(R.drawable.list_activities_show_poi_description)); + poiDescription.setIcon(getResources().getDrawable(R.drawable.ic_action_note_light)); poiDescription.setTitle(getString(R.string.poi_context_menu_showdescription)); final StringBuilder d = getDescriptionContent(amenity); poiDescription.setOnClickListener(new OnClickListener() { diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index 27f022d4aa..70e8a93a1e 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -741,8 +741,8 @@ public class MapInfoLayer extends OsmandMapLayer { final OsmandMapTileView view = map.getMapView(); FrameLayout.LayoutParams fparams = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); - final Drawable config = view.getResources().getDrawable(R.drawable.list_activities_config); - final Drawable configWhite = view.getResources().getDrawable(R.drawable.list_activities_config_white); + final Drawable config = view.getResources().getDrawable(R.drawable.map_config); + final Drawable configWhite = view.getResources().getDrawable(R.drawable.map_config_white); ImageViewWidget configuration = new ImageViewWidget(map) { private boolean nm; @@ -772,8 +772,8 @@ public class MapInfoLayer extends OsmandMapLayer { return fl; } private View createLayer(){ -// final Drawable globusDrawable = view.getResources().getDrawable(R.drawable.list_activities_globus); -// final Drawable globusDrawableWhite = view.getResources().getDrawable(R.drawable.list_activities_globus_white); +// final Drawable globusDrawable = view.getResources().getDrawable(R.drawable.map_globus); +// final Drawable globusDrawableWhite = view.getResources().getDrawable(R.drawable.map_globus_white); final Drawable layerDrawable = view.getResources().getDrawable(R.drawable.map_layers_black); final Drawable layerDrawableWhite = view.getResources().getDrawable(R.drawable.map_layers_white); diff --git a/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java b/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java index 931541f594..32e480805a 100644 --- a/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/MonitoringInfoControl.java @@ -43,8 +43,8 @@ public class MonitoringInfoControl { } public ImageViewWidget createMonitoringWidget(final OsmandMapTileView view, final MapActivity map) { - final Drawable m = view.getResources().getDrawable(R.drawable.list_activities_monitoring); - final Drawable mWhite = view.getResources().getDrawable(R.drawable.list_activities_monitoring_white); + final Drawable m = view.getResources().getDrawable(R.drawable.map_monitoring); + final Drawable mWhite = view.getResources().getDrawable(R.drawable.map_monitoring_white); final ImageViewWidget monitoringServices = new ImageViewWidget(view.getContext()) { private boolean nightMode; @Override diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java index 71998819ea..d93164fe1e 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java @@ -235,8 +235,8 @@ public class MapInfoWidgetsFactory { public ImageViewWidget createCompassView(final MapActivity map){ final OsmandMapTileView view = map.getMapView(); - final Drawable compass = map.getResources().getDrawable(R.drawable.list_activities_compass); - final Drawable compassWhite = map.getResources().getDrawable(R.drawable.list_activities_compass_white); + final Drawable compass = map.getResources().getDrawable(R.drawable.map_compass); + final Drawable compassWhite = map.getResources().getDrawable(R.drawable.map_compass_white); final int mw = (int) compass.getMinimumWidth() ; final int mh = (int) compass.getMinimumHeight() ; ImageViewWidget compassView = new ImageViewWidget(map) {