From 9b57c8e5ffa16cfc58d3f7bf51781f96afff9ce2 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 27 Nov 2014 17:39:38 +0100
Subject: [PATCH] Update master branch with new home screen

---
 OsmAnd/res/layout-land/dashboard_search.xml               | 6 +++---
 OsmAnd/res/layout/dashboard.xml                           | 2 +-
 .../src/net/osmand/plus/activities/DashboardActivity.java | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout-land/dashboard_search.xml b/OsmAnd/res/layout-land/dashboard_search.xml
index 34d0ce8b71..895065e3a9 100644
--- a/OsmAnd/res/layout-land/dashboard_search.xml
+++ b/OsmAnd/res/layout-land/dashboard_search.xml
@@ -52,9 +52,9 @@
             android:drawableTop="@drawable/ic_action_marker2"
             android:text="@string/coordinates" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
+	<View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
             android:background="@color/dashboard_divider" />
 
         <Button
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 2c3f62b84d..48bf022388 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:padding="6dp" >
-		<include android:id="@layout/dashboard_search"/>
+		<include layout="@layout/dashboard_search"/>
 
         <LinearLayout
             android:layout_width="fill_parent"
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 2494ea3eb8..779b9c436b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -86,6 +86,13 @@ public class DashboardActivity extends SherlockFragmentActivity implements IMapD
 	private ProgressDialog startProgressDialog;
 	private OsmandMapTileView osmandMapTileView;
 
+	
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+		getMyApplication().getResourceManager().getMapTileDownloader().removeDownloaderCallback(this);
+	}
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
@@ -112,6 +119,7 @@ public class DashboardActivity extends SherlockFragmentActivity implements IMapD
 		setupMapView();
 		setupButtons();
 		setupFonts();
+		getMyApplication().getResourceManager().getMapTileDownloader().addDownloaderCallback(this);
 	}
 	
 	@Override