Rename icons

OsmAnd/res/layout/searchpoi.xml

@@ -3,17 +3,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
-	<!-- 
-	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
-		<ImageButton android:src="@drawable/filter" android:id="@+id/ShowFilter"
-				android:layout_height="wrap_content" android:layout_width="wrap_content" android:contentDescription="@string/search_poi_filter"/>
-		<ImageButton   android:src="@drawable/list_activities_show_on_map" android:contentDescription="@string/search_shown_on_map"
-				android:id="@+id/ShowOnMap" android:layout_height="wrap_content" android:layout_width="wrap_content"/>
-		<Button  android:text="@string/search_POI_level_btn"   
-		android:id="@+id/SearchPOILevelButton" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1"/>
-		<TextView android:layout_width="wrap_content" android:text="" android:id="@+id/SearchAreaText" android:layout_height="wrap_content"/>
-		<ProgressBar android:layout_width="wrap_content" android:text="" android:id="@+id/ProgressBar" android:layout_height="wrap_content" android:visibility="gone"/>
-	</LinearLayout> -->
 	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/SearchFilterLayout" android:visibility="gone"
 	    android:layout_marginLeft = "5dp" >
 		<TextView android:layout_width="wrap_content" android:text="@string/search_poi_filter" android:id="@+id/TextView" android:layout_height="wrap_content"/>

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);
 

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);
 

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() {

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);
 		

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

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) {