diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
| commit | c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7 (patch) | |
| tree | 69ba7ee4c132b2bf6ec138fdcaf0988309b40e56 /src/net/cbaines/suma/MapActivity.java | |
| parent | a32b31c29d45b68918ec2a28fff7d87e675c6768 (diff) | |
| parent | 4a45362d8823a84cf9c3c805c006331303a0da33 (diff) | |
| download | southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar.gz | |
Merge branch 'dev-search' into dev
Conflicts:
gen/net/cbaines/suma/R.java
res/values/strings.xml
src/net/cbaines/suma/DataManager.java
src/net/cbaines/suma/MapActivity.java
src/net/cbaines/suma/POI.java
Diffstat (limited to 'src/net/cbaines/suma/MapActivity.java')
| -rw-r--r-- | src/net/cbaines/suma/MapActivity.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/net/cbaines/suma/MapActivity.java b/src/net/cbaines/suma/MapActivity.java index 374f568..8ed8e9e 100644 --- a/src/net/cbaines/suma/MapActivity.java +++ b/src/net/cbaines/suma/MapActivity.java @@ -857,8 +857,7 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants // Handle item selection switch (item.getItemId()) { case R.id.menu_find: - Intent i = new Intent(MapActivity.this, FindActivity.class); - startActivityForResult(i, 0); + onSearchRequested(); return true; case R.id.menu_preferences: Intent settingsActivity = new Intent(getBaseContext(), PreferencesActivity.class); @@ -958,13 +957,6 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants } } - @Override - public boolean onSearchRequested() { - Intent i = new Intent(MapActivity.this, FindActivity.class); - startActivityForResult(i, 0); - return false; - } - protected void onActivityResult(int requestCode, int resultCode, Intent data) { Log.i(TAG, "Got activity result"); if (resultCode == RESULT_OK) { |