From c34b19f69ce483ff01d8749a73bb6d561f2abf09 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Tue, 27 Oct 2015 19:30:34 +0300
Subject: [PATCH] Fix

---
 .../plus/download/DownloadActivity.java       |  1 +
 .../plus/download/ui/GoToMapFragment.java     | 23 +++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 5a2273eb22..0819d84db3 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/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();
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/GoToMapFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/GoToMapFragment.java
index cd7be417bc..06ddf7bedd 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/GoToMapFragment.java
+++ b/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)
-				.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						dismiss();
-					}
-				});
+		final ImageButton closeImageButton = (ImageButton) view.findViewById(R.id.closeImageButton);
+		closeImageButton.setImageDrawable(getContentIcon(R.drawable.ic_action_remove_dark));
+		closeImageButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			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();