From 7b8a3a76fa081530bb0bcbdb4cbdac62f89497a6 Mon Sep 17 00:00:00 2001
From: Pavol Zibrita <pavol.zibrita@gmail.com>
Date: Sat, 11 Feb 2012 23:27:07 +0100
Subject: [PATCH] Fixed shadow in search, Fixed NPE in ResourceManager

---
 OsmAnd/AndroidManifest.xml                                   | 2 +-
 OsmAnd/res/layout/search_main.xml                            | 5 ++---
 OsmAnd/res/values/styles.xml                                 | 2 +-
 OsmAnd/src/net/osmand/plus/ResourceManager.java              | 2 +-
 OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java | 2 +-
 .../net/osmand/plus/activities/search/SearchActivity.java    | 1 -
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 3aebdf18c3..a081d63be8 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -9,7 +9,7 @@
 	<!--   uncomment it to allow different screen supports (large/small)-->
 	<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4"/>  
 	
-	<application android:icon="@drawable/icon" android:label="@string/app_name"
+	<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@style/OsmandTheme"
 		android:debuggable="true" android:name="net.osmand.plus.activities.OsmandApplication" android:description="@string/app_description"
 		android:backupAgent="net.osmand.plus.OsmandBackupAgent" android:restoreAnyVersion="true">
 		<activity android:name="net.osmand.plus.activities.MainMenuActivity"
diff --git a/OsmAnd/res/layout/search_main.xml b/OsmAnd/res/layout/search_main.xml
index 1ce13299c7..f593b23a3c 100644
--- a/OsmAnd/res/layout/search_main.xml
+++ b/OsmAnd/res/layout/search_main.xml
@@ -33,10 +33,9 @@
             android:id="@android:id/tabs"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" />
-        <FrameLayout
+		<FrameLayout
             android:id="@android:id/tabcontent"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-             />
+            android:layout_height="fill_parent" />
     </LinearLayout>
 </TabHost>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 6dd2da8adc..8cc91af3db 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -51,7 +51,7 @@
     <style name="WhiteText">
         <item name="android:textColor">@color/activity_text</item>
     </style>
-    <style name="NiceActivity" parent="android:Theme">
+    <style name="OsmandTheme" parent="android:style/Theme">
         <item name="android:windowContentOverlay">@null</item>
     </style>
 </resources>
diff --git a/OsmAnd/src/net/osmand/plus/ResourceManager.java b/OsmAnd/src/net/osmand/plus/ResourceManager.java
index 80de19092e..4ca1704200 100644
--- a/OsmAnd/src/net/osmand/plus/ResourceManager.java
+++ b/OsmAnd/src/net/osmand/plus/ResourceManager.java
@@ -802,7 +802,7 @@ public class ResourceManager {
 	
 	public Map<String, String> getBackupIndexes(Map<String, String> map) {
 		File file = context.getSettings().extendOsmandPath(BACKUP_PATH);
-		if (file != null) {
+		if (file != null && file.isDirectory()) {
 			for (File f : file.listFiles()) {
 				if (f != null && f.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
 					map.put(f.getName(), MessageFormat.format("{0,date,dd.MM.yyyy}", new Date(f.lastModified()))); //$NON-NLS-1$		
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index 0ceef59309..5eaf9e854b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -350,7 +350,7 @@ public class MapActivityLayers {
 			}
 		};
 		Builder b = new AlertDialog.Builder(activity);
-		ListView list = new ListView(activity, null, R.style.NiceActivity);
+		ListView list = new ListView(activity);
 //		list.setBackgroundColor(R.color.color_white);
 		b.setView(list);
 		final List<String> layerNames = new ArrayList<String>();
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
index c6461c66d4..1d51379799 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
@@ -84,7 +84,6 @@ public class SearchActivity extends TabActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		requestWindowFeature(Window.FEATURE_NO_TITLE); 
-		setTheme(R.style.NiceActivity);
 		setContentView(R.layout.search_main);
 		
 		Button backButton = (Button) findViewById(R.id.search_back_button);