Merge branch 'master' of https://github.com/osmandapp/Osmand

OsmAnd/res/values-da/strings.xml

@@ -2196,4 +2196,7 @@
     <string name="hello_blank_fragment">Hej tomme fragment</string>
 <string name="application_dir_description">Vælg hvor kortfilerne skal gemmes.</string>
 <string name="show_on_start_description">\'Fra\' starter direkte på kortet</string>
-</resources>
+<string name="map_downloaded">Kort hentet</string>
+    <string name="map_downloaded_descr">Kort over %1$ s er hentet. Gå tilbage til kortet for at begynde at bruge det.</string>
+    <string name="go_to_map">Gå til kortet</string>
+    </resources>

OsmAnd/res/values-lt/strings.xml

@@ -2181,4 +2181,8 @@
     <string name="update_all">Atnaujinti viską (%1$s MB)</string>
 <string name="srtm_plugin_disabled">Kontūro linijos išjungtos</string>
     <string name="shared_string_send">Siųsti</string>
+    <string name="map_downloaded">Žemėlapis atsiųstas</string>
+    <string name="map_downloaded_descr">%1$s žemėlapio jau atsiųsta. Norėdami pradėti juo naudotis, grįžkite į žemėlapį.</string>
+    <string name="go_to_map">Atidaryti žemėlapį</string>
+    <string name="application_dir_description">Pasirinkite vietą, kurioje norėsite išsaugoti žemėlapius.</string>
     </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -2337,4 +2337,9 @@
 	<string name="poi_club_sailing">Клуб парусного спорта</string>
 	<string name="poi_club_scout">Клуб скаутов</string>
 
+	<string name="poi_historic_threshing_floor">Историческое гумно</string>
+	<string name="poi_historic_gallows">Историческая виселица</string>
+	<string name="poi_historic_railway">Историческая железная дорога</string>
+
+
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -2148,4 +2148,7 @@
     <string name="shared_string_send">Imbia</string>
     <string name="hello_blank_fragment">Sabuna/Inneta su segmentu</string>
     <string name="application_dir_description">Issèbera in ue boles pònnere sos documentos de sas mapas.</string>
-</resources>
+<string name="map_downloaded">Mapa iscarrigada</string>
+    <string name="map_downloaded_descr">Sa mapa de %1$s est istada iscarrigada. Torra a sa mapa pro incumintzare a l’impreare.</string>
+    <string name="go_to_map">Bae a sa mapa</string>
+    </resources>

OsmAnd/res/values/phrases.xml

@@ -2341,5 +2341,8 @@
 	<string name="poi_club_sailing">Sailing club</string>
 	<string name="poi_club_scout">Scout club</string>
 
+	<string name="poi_historic_threshing_floor">Historic threshing floor</string>
+	<string name="poi_historic_gallows">Historic gallows</string>
+	<string name="poi_historic_railway">Historic railway</string>
 
 </resources>

OsmAnd/src/net/osmand/plus/download/DownloadActivity.java

@@ -222,6 +222,7 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
 				initSettingsFirstMap(downloadItem);
 			}
 			showGoToMap(downloadItem);
+			downloadItem = null;
 		}
 		for (WeakReference<Fragment> ref : fragSet) {
 			Fragment f = ref.get();

OsmAnd/src/net/osmand/plus/download/ui/GoToMapFragment.java

@@ -14,6 +14,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -42,6 +43,8 @@ public class GoToMapFragment extends DialogFragment {
 				: R.style.OsmandDarkTheme_BottomSheet;
 		final Dialog dialog = new Dialog(getActivity(), themeId);
 		dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+		dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+		dialog.getWindow().setDimAmount(0.3f);
 		dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;
 		return dialog;
 	}
@@ -66,13 +69,14 @@ public class GoToMapFragment extends DialogFragment {
 		((TextView) view.findViewById(R.id.descriptionTextView))
 				.setText(getActivity().getString(R.string.map_downloaded_descr, regionName));
 
-		view.findViewById(R.id.closeImageButton)
+		final ImageButton closeImageButton = (ImageButton) view.findViewById(R.id.closeImageButton);
-				.setOnClickListener(new View.OnClickListener() {
+		closeImageButton.setImageDrawable(getContentIcon(R.drawable.ic_action_remove_dark));
-					@Override
+		closeImageButton.setOnClickListener(new View.OnClickListener() {
-					public void onClick(View v) {
+			@Override
-						dismiss();
+			public void onClick(View v) {
-					}
+				dismiss();
-				});
+			}
+		});
 
 		view.findViewById(R.id.actionButton)
 				.setOnClickListener(new View.OnClickListener() {
@@ -80,6 +84,7 @@ public class GoToMapFragment extends DialogFragment {
 					public void onClick(View v) {
 						OsmandApplication app = (OsmandApplication) getActivity().getApplication();
 						app.getSettings().setMapLocationToShow(regionCenter.getLatitude(), regionCenter.getLongitude(), 5, null);
+						dismiss();
 						MapActivity.launchMapActivityMoveToTop(getActivity());
 					}
 				});
@@ -113,6 +118,10 @@ public class GoToMapFragment extends DialogFragment {
 		return getMyApplication().getIconsCache().getIcon(drawableRes, color);
 	}
 
+	private Drawable getContentIcon(@DrawableRes int drawableRes) {
+		return getMyApplication().getIconsCache().getContentIcon(drawableRes);
+	}
+
 	public static void showInstance(WorldRegion region, DownloadActivity activity) {
 		GoToMapFragment fragment = new GoToMapFragment();
 		fragment.regionCenter = region.getRegionCenter();