From d97f756e95702a3221fd934c1b8eb2dd942e8990 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Sat, 17 Jan 2015 15:04:26 +0100
Subject: [PATCH] reset for now

---
 OsmAnd/res/values/strings.xml                   |  2 +-
 .../search/SearchBuildingByNameActivity.java    |  1 +
 .../search/SearchCityByNameActivity.java        | 17 ++++++++---------
 .../search/SearchRegionByNameActivity.java      |  1 +
 .../search/SearchStreet2ByNameActivity.java     |  1 +
 .../search/SearchStreetByNameActivity.java      |  1 +
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index af0d0caf00..fed6bd8ce9 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2038,7 +2038,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="poi_dialog_comment_default">POI changing</string>
 	<string name="poi_dialog_other_tags_message">All other tags are preserved</string>
 	<string name="default_buttons_commit">Commit</string>
-	<string name="default_buttons_reset">Reset</string>
+	<string name="default_buttons_reset">Clear</string>
 	<string name="filter_current_poiButton">Filter</string>
 	<string name="edit_filter_delete_menu_item">Delete</string>
 	<string name="edit_filter_save_as_menu_item">Save As</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java
index ad8d25e3e4..577f881b4b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchBuildingByNameActivity.java
@@ -38,6 +38,7 @@ public class SearchBuildingByNameActivity extends SearchByNameAbstractActivity<B
 
 	@Override
 	protected void reset() {
+		//This is really only a "clear input text field", hence do not reset settings here
 		//osmandSettings.setLastSearchedBuilding("", null);
 		super.reset();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java
index b1604caa4f..2b2ed1704b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java
@@ -4,7 +4,7 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 
-import net.osmand.IProgress;
+//import net.osmand.IProgress;
 import net.osmand.CollatorStringMatcher;
 import net.osmand.CollatorStringMatcher.StringMatcherMode;
 import net.osmand.OsmAndCollator;
@@ -35,19 +35,18 @@ public class SearchCityByNameActivity extends SearchByNameAbstractActivity<City>
 
 	@Override
 	protected void reset() {
+		//This is really only a "clear input text field", hence do not reset settings here
 		//searchVillagesMode = -1;
 		//osmandSettings.setLastSearchedCity(-1L, "", null);
 
 		//Issue 2535: Try to reload indexes as workaround
 		//            This creates the issue immediately after tapping "Reset", but then going back to the searchAdressFragment screen resets the issue and everything works(!?)
-		new AsyncTask<Void, Void, List<String>>() {
-			@Override
-			protected List<String> doInBackground(Void... params) {
-				return getMyApplication().getResourceManager().reloadIndexes(IProgress.EMPTY_PROGRESS);
-			}
-		}.execute();
-		createComparator();
-		getInitializeTask();
+		//new AsyncTask<Void, Void, List<String>>() {
+		//	@Override
+		//	protected List<String> doInBackground(Void... params) {
+		//		return getMyApplication().getResourceManager().reloadIndexes(IProgress.EMPTY_PROGRESS);
+		//	}
+		//}.execute();
 
 		super.reset();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchRegionByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchRegionByNameActivity.java
index d6b7f54e8f..61a6409190 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchRegionByNameActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchRegionByNameActivity.java
@@ -32,6 +32,7 @@ public class SearchRegionByNameActivity extends SearchByNameAbstractActivity<Reg
 
 	@Override
 	protected void reset() {
+		//This is really only a "clear input text field", hence do not reset settings here
 		//osmandSettings.setLastSearchedRegion("", null);
 		super.reset();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java
index a1c8864a7a..0b1408da6f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreet2ByNameActivity.java
@@ -27,6 +27,7 @@ public class SearchStreet2ByNameActivity extends SearchByNameAbstractActivity<St
 
 	@Override
 	protected void reset() {
+		//This is really only a "clear input text field", hence do not reset settings here
 		//osmandSettings.setLastSearchedIntersectedStreet("", null);
 		super.reset();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java
index be47eccf66..68f9ef634e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java
@@ -53,6 +53,7 @@ public class SearchStreetByNameActivity extends SearchByNameAbstractActivity<Str
 
 	@Override
 	protected void reset() {
+		//This is really only a "clear input text field", hence do not reset settings here
 		//searchWithCity = -1;
 		//osmandSettings.setLastSearchedStreet("", null);
 		super.reset();