Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Call superclass method when creating and preparing menu. fixes #278

This commit is contained in:
daniel oeh 2013-09-18 19:45:54 +02:00
parent f1a45f1308
commit b06186b300
20 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/de/danoeh/antennapod/activity/AddFeedActivity.java
View File

@ -206,6 +206,7 @@ public class AddFeedActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
return true; return true;
} }

2
src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java
View File

@ -280,6 +280,7 @@ public class DirectoryChooserActivity extends ActionBarActivity {
@Override @Override
public boolean onPrepareOptionsMenu(Menu menu) { public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
menu.findItem(R.id.new_folder_item) menu.findItem(R.id.new_folder_item)
.setVisible(isValidFile(selectedDir)); .setVisible(isValidFile(selectedDir));
return true; return true;
@ -287,6 +288,7 @@ public class DirectoryChooserActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.directory_chooser, menu); inflater.inflate(R.menu.directory_chooser, menu);
return true; return true;

1
src/de/danoeh/antennapod/activity/DownloadActivity.java
View File

@ -183,6 +183,7 @@ public class DownloadActivity extends ActionBarActivity implements
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, MENU_SHOW_LOG, Menu.NONE, MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, MENU_SHOW_LOG, Menu.NONE,
R.string.show_download_log), R.string.show_download_log),
MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW); MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);

1
src/de/danoeh/antennapod/activity/DownloadLogActivity.java
View File

@ -59,6 +59,7 @@ public class DownloadLogActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
return true; return true;
} }

2
src/de/danoeh/antennapod/activity/FeedInfoActivity.java
View File

@ -95,6 +95,7 @@ public class FeedInfoActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
if (feed != null) { if (feed != null) {
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.feedinfo, menu); inflater.inflate(R.menu.feedinfo, menu);
@ -106,6 +107,7 @@ public class FeedInfoActivity extends ActionBarActivity {
@Override @Override
public boolean onPrepareOptionsMenu(Menu menu) { public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
if (feed != null) { if (feed != null) {
menu.findItem(R.id.support_item).setVisible( menu.findItem(R.id.support_item).setVisible(
feed.getPaymentLink() != null); feed.getPaymentLink() != null);

2
src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
View File

@ -114,6 +114,7 @@ public class FeedItemlistActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
if (feed != null) { if (feed != null) {
TypedArray drawables = obtainStyledAttributes(new int[]{R.attr.action_search}); TypedArray drawables = obtainStyledAttributes(new int[]{R.attr.action_search});
MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label) MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label)
@ -139,6 +140,7 @@ public class FeedItemlistActivity extends ActionBarActivity {
@Override @Override
public boolean onPrepareOptionsMenu(Menu menu) { public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
return FeedMenuHandler.onPrepareOptionsMenu(menu, feed); return FeedMenuHandler.onPrepareOptionsMenu(menu, feed);
} }

1
src/de/danoeh/antennapod/activity/FlattrAuthActivity.java
View File

@ -91,6 +91,7 @@ public class FlattrAuthActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
return true; return true;
} }

2
src/de/danoeh/antennapod/activity/ItemviewActivity.java
View File

@ -125,6 +125,7 @@ public class ItemviewActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
if (item != null) { if (item != null) {
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.feeditem, menu); inflater.inflate(R.menu.feeditem, menu);
@ -156,6 +157,7 @@ public class ItemviewActivity extends ActionBarActivity {
@Override @Override
public boolean onPrepareOptionsMenu(final Menu menu) { public boolean onPrepareOptionsMenu(final Menu menu) {
super.onPrepareOptionsMenu(menu);
return FeedItemMenuHandler.onPrepareMenu( return FeedItemMenuHandler.onPrepareMenu(
new FeedItemMenuHandler.MenuInterface() { new FeedItemMenuHandler.MenuInterface() {

2
src/de/danoeh/antennapod/activity/MainActivity.java
View File

@ -166,6 +166,7 @@ public class MainActivity extends ActionBarActivity {
@Override @Override
public boolean onPrepareOptionsMenu(Menu menu) { public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
MenuItem refreshAll = menu.findItem(R.id.all_feed_refresh); MenuItem refreshAll = menu.findItem(R.id.all_feed_refresh);
if (DownloadService.isRunning if (DownloadService.isRunning
&& DownloadRequester.getInstance().isDownloadingFeeds()) { && DownloadRequester.getInstance().isDownloadingFeeds()) {
@ -178,6 +179,7 @@ public class MainActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.main, menu); inflater.inflate(R.menu.main, menu);

2
src/de/danoeh/antennapod/activity/MediaplayerActivity.java
View File

@ -222,6 +222,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.mediaplayer, menu); inflater.inflate(R.menu.mediaplayer, menu);
return true; return true;
@ -229,6 +230,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
@Override @Override
public boolean onPrepareOptionsMenu(Menu menu) { public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
Playable media = controller.getMedia(); Playable media = controller.getMedia();
menu.findItem(R.id.support_item).setVisible( menu.findItem(R.id.support_item).setVisible(

1
src/de/danoeh/antennapod/activity/MiroGuideCategoryActivity.java
View File

@ -51,6 +51,7 @@ public class MiroGuideCategoryActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
return true; return true;
} }

2
src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java
View File

@ -132,6 +132,7 @@ public class MiroGuideChannelViewActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.channelview, menu); inflater.inflate(R.menu.channelview, menu);
return true; return true;
@ -139,6 +140,7 @@ public class MiroGuideChannelViewActivity extends ActionBarActivity {
@Override @Override
public boolean onPrepareOptionsMenu(Menu menu) { public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
boolean channelLoaded = channel != null; boolean channelLoaded = channel != null;
boolean beingDownloaded = channelLoaded boolean beingDownloaded = channelLoaded
&& DownloadRequester.getInstance().isDownloadingFile( && DownloadRequester.getInstance().isDownloadingFile(

1
src/de/danoeh/antennapod/activity/MiroGuideMainActivity.java
View File

@ -128,6 +128,7 @@ public class MiroGuideMainActivity extends ActionBarActivity implements AdapterV
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label) MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label)
.setIcon( .setIcon(
obtainStyledAttributes( obtainStyledAttributes(

1
src/de/danoeh/antennapod/activity/MiroGuideSearchActivity.java
View File

@ -63,6 +63,7 @@ public class MiroGuideSearchActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label) MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label)
.setIcon( .setIcon(
obtainStyledAttributes( obtainStyledAttributes(

1
src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
View File

@ -101,6 +101,7 @@ public class OpmlFeedChooserActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.select_all_item, Menu.NONE, MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.select_all_item, Menu.NONE,
R.string.select_all_label), R.string.select_all_label),
MenuItem.SHOW_AS_ACTION_IF_ROOM); MenuItem.SHOW_AS_ACTION_IF_ROOM);

1
src/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
View File

@ -87,6 +87,7 @@ public class OpmlImportFromPathActivity extends OpmlImportBaseActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
return true; return true;
} }

1
src/de/danoeh/antennapod/activity/PlaybackHistoryActivity.java
View File

@ -20,6 +20,7 @@ public class PlaybackHistoryActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.clear_history_item, Menu.NONE, MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.clear_history_item, Menu.NONE,
R.string.clear_history_label), R.string.clear_history_label),
MenuItem.SHOW_AS_ACTION_IF_ROOM); MenuItem.SHOW_AS_ACTION_IF_ROOM);

1
src/de/danoeh/antennapod/activity/PreferenceActivity.java
View File

@ -300,6 +300,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
return true; return true;
} }

1
src/de/danoeh/antennapod/activity/SearchActivity.java
View File

@ -92,6 +92,7 @@ public class SearchActivity extends ActionBarActivity implements AdapterView.OnI
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label) MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label)
.setIcon( .setIcon(
obtainStyledAttributes( obtainStyledAttributes(

1
src/de/danoeh/antennapod/activity/gpoddernet/GpodnetActivity.java
View File

@ -24,6 +24,7 @@ public class GpodnetActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label) MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label)
.setIcon( .setIcon(
obtainStyledAttributes( obtainStyledAttributes(