Merge branch 'dev' of github.com:cbaines/SouthamptonUniversityMap into dev

Conflicts:
	AndroidManifest.xml
	src/net/cbaines/suma/MapActivity.java

1 files changed, 3 insertions, 9 deletions

diff --git a/src/net/cbaines/suma/SearchResultsActivity.java b/src/net/cbaines/suma/SearchResultsActivity.java
index a7b5a55..503c876 100644
--- a/src/net/cbaines/suma/SearchResultsActivity.java
+++ b/src/net/cbaines/suma/SearchResultsActivity.java
@@ -43,7 +43,6 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.ProgressBar;
@@ -61,7 +60,6 @@ public class SearchResultsActivity extends OrmLiteBaseActivity<DatabaseHelper> i
 	public static final String ORIGIN = "o";
 	public static final int MAP_ACTIVITY = 0;
 
-	private EditText searchBar;
 	private ListView listItems;
 	private ProgressBar progBar;
 	private LinearLayout findContentLayout;
@@ -245,18 +243,14 @@ public class SearchResultsActivity extends OrmLiteBaseActivity<DatabaseHelper> i
 	/** Called when the activity is first created. */
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.find_activity);
+		setContentView(R.layout.search_activity);
 
 		Log.i(TAG, "FindActivity started");
 
-		searchBar = (EditText) findViewById(R.id.searchBar);
-		searchBar.addTextChangedListener(this);
-
 		Intent intent = getIntent();
 		if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
-			String query = intent.getStringExtra(SearchManager.QUERY);
-			Log.i(TAG, "Searching for " + query);
-			searchBar.setText(query);
+			searchTerm = intent.getStringExtra(SearchManager.QUERY);
+			Log.i(TAG, "Searching for " + searchTerm);
 		}
 
 		listItems = (ListView) findViewById(R.id.findListItems);