diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2012-07-24 15:48:11 +0200 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2012-07-24 15:48:11 +0200 |
commit | 8bad211f6887447513129e2dc1fe5babcfdc9024 (patch) | |
tree | 9fa2a1d6472d61fe25ee7d896aa24790fcb5f1d3 /src/de/danoeh/antennapod/activity/SearchActivity.java | |
parent | 80a9100b8f4298f3e670b008ba71458c6cd7337e (diff) | |
download | AntennaPod-8bad211f6887447513129e2dc1fe5babcfdc9024.zip |
Added search button to SearchActivity
Diffstat (limited to 'src/de/danoeh/antennapod/activity/SearchActivity.java')
-rw-r--r-- | src/de/danoeh/antennapod/activity/SearchActivity.java | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/src/de/danoeh/antennapod/activity/SearchActivity.java b/src/de/danoeh/antennapod/activity/SearchActivity.java index 4f84da736..df97c1870 100644 --- a/src/de/danoeh/antennapod/activity/SearchActivity.java +++ b/src/de/danoeh/antennapod/activity/SearchActivity.java @@ -46,11 +46,22 @@ public class SearchActivity extends SherlockListActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); setContentView(R.layout.searchlist); txtvStatus = (TextView) findViewById(android.R.id.empty); + } + + @Override + protected void onNewIntent(Intent intent) { + setIntent(intent); + } + + @Override + protected void onResume() { + super.onResume(); Intent intent = getIntent(); if (Intent.ACTION_SEARCH.equals(intent.getAction())) { Bundle extra = intent.getBundleExtra(SearchManager.APP_DATA); if (extra != null) { - if (AppConfig.DEBUG) Log.d(TAG, "Found bundle extra"); + if (AppConfig.DEBUG) + Log.d(TAG, "Found bundle extra"); long feedId = extra.getLong(EXTRA_FEED_ID); selectedFeed = FeedManager.getInstance().getFeed(feedId); } @@ -65,6 +76,9 @@ public class SearchActivity extends SherlockListActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { + menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label) + .setIcon(R.drawable.action_search) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); return true; } @@ -74,12 +88,26 @@ public class SearchActivity extends SherlockListActivity { case android.R.id.home: startActivity(new Intent(this, MainActivity.class)); return true; + case R.id.search_item: + onSearchRequested(); + return true; default: return false; } } @Override + public boolean onSearchRequested() { + Bundle extra = null; + if (selectedFeed != null) { + extra = new Bundle(); + extra.putLong(EXTRA_FEED_ID, selectedFeed.getId()); + } + startSearch(null, false, extra, false); + return true; + } + + @Override protected void onListItemClick(ListView l, View v, int position, long id) { super.onListItemClick(l, v, position, id); SearchResult selection = searchAdapter.getItem(position); @@ -107,6 +135,10 @@ public class SearchActivity extends SherlockListActivity { @Override protected void onPreExecute() { + if (searchAdapter != null) { + searchAdapter.clear(); + searchAdapter.notifyDataSetChanged(); + } txtvStatus.setText(R.string.search_status_searching); } |