diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-09-15 13:21:19 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-09-15 13:21:19 +0200 |
| commit | 813614bb28e287d6302dcb06a95867e76f573987 (patch) | |
| tree | 75e9cde19fce5f3ec7f3a2cd736140f00bafb024 /src/de/danoeh/antennapod/activity | |
| parent | 4a2a25a551ab59d71e67c9a70997629d00450ff0 (diff) | |
| download | AntennaPod-813614bb28e287d6302dcb06a95867e76f573987.zip | |
Fixed visibility of MenuItems
Use custom namespace for "showAsAction" and "getMenuInflater" instead of "new MenuInflater"
Diffstat (limited to 'src/de/danoeh/antennapod/activity')
7 files changed, 6 insertions, 11 deletions
diff --git a/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java b/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java index 62273c960..f4c2779cd 100644 --- a/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java +++ b/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java @@ -287,7 +287,7 @@ public class DirectoryChooserActivity extends ActionBarActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = new MenuInflater(this); + MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.directory_chooser, menu); return true; } diff --git a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java index 3cb46a4f8..6508ee568 100644 --- a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java +++ b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java @@ -96,7 +96,7 @@ public class FeedInfoActivity extends ActionBarActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { if (feed != null) { - MenuInflater inflater = new MenuInflater(this); + MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.feedinfo, menu); return true; } else { diff --git a/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java b/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java index 8fba44e5c..ae61c052a 100644 --- a/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java +++ b/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java @@ -131,7 +131,7 @@ public class FeedItemlistActivity extends ActionBarActivity { searchView.setSearchableInfo( searchManager.getSearchableInfo(getComponentName())); return FeedMenuHandler - .onCreateOptionsMenu(new MenuInflater(this), menu); + .onCreateOptionsMenu(getMenuInflater(), menu); } else { return false; } diff --git a/src/de/danoeh/antennapod/activity/ItemviewActivity.java b/src/de/danoeh/antennapod/activity/ItemviewActivity.java index 60b59a993..17bd6536f 100644 --- a/src/de/danoeh/antennapod/activity/ItemviewActivity.java +++ b/src/de/danoeh/antennapod/activity/ItemviewActivity.java @@ -128,11 +128,6 @@ public class ItemviewActivity extends ActionBarActivity { if (item != null) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.feeditem, menu); - // MenuItem visibility has to be set programmatically here; TODO remove this workaround - MenuItemCompat.setShowAsAction(menu.findItem(R.id.download_item), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW); - MenuItemCompat.setShowAsAction(menu.findItem(R.id.stream_item), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW); - MenuItemCompat.setShowAsAction(menu.findItem(R.id.play_item), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW); - MenuItemCompat.setShowAsAction(menu.findItem(R.id.cancel_download_item), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW); return true; } else { return false; diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/src/de/danoeh/antennapod/activity/MainActivity.java index 4f25a07f1..b61314a48 100644 --- a/src/de/danoeh/antennapod/activity/MainActivity.java +++ b/src/de/danoeh/antennapod/activity/MainActivity.java @@ -178,7 +178,7 @@ public class MainActivity extends ActionBarActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = new MenuInflater(this); + MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.main, menu); SearchManager searchManager = diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java index af244f2ed..9487d1429 100644 --- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -222,7 +222,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = new MenuInflater(this); + MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.mediaplayer, menu); return true; } diff --git a/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java b/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java index d4b4597f2..9ce0ab1f7 100644 --- a/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java +++ b/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java @@ -132,7 +132,7 @@ public class MiroGuideChannelViewActivity extends ActionBarActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = new MenuInflater(this); + MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.channelview, menu); return true; } |