diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-08-10 16:10:32 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-08-10 16:10:32 +0200 |
| commit | 8e16ad08c883615f64c21fcc4c54c1a565bf0b1b (patch) | |
| tree | 0cdf31c66ae5a065e30ab7184943ed8710211d13 /src/de/danoeh/antennapod/activity/MediaplayerActivity.java | |
| parent | dddc01e2e4911e0e07eb68c797472255414b6f7f (diff) | |
| parent | 26fad34b6501adba7720c8728732d18bc613472b (diff) | |
| download | AntennaPod-8e16ad08c883615f64c21fcc4c54c1a565bf0b1b.zip | |
Merge branch 'feedmanager_removal' into develop
Conflicts:
src/de/danoeh/antennapod/activity/DownloadLogActivity.java
src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
src/de/danoeh/antennapod/activity/ItemviewActivity.java
src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java
src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
src/de/danoeh/antennapod/activity/PreferenceActivity.java
src/de/danoeh/antennapod/fragment/EpisodesFragment.java
src/de/danoeh/antennapod/fragment/FeedlistFragment.java
src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
src/de/danoeh/antennapod/fragment/ItemlistFragment.java
Diffstat (limited to 'src/de/danoeh/antennapod/activity/MediaplayerActivity.java')
| -rw-r--r-- | src/de/danoeh/antennapod/activity/MediaplayerActivity.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java index fe9eaed62..b5b694995 100644 --- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -20,7 +20,6 @@ import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.asynctask.FlattrClickWorker; import de.danoeh.antennapod.dialog.TimeDialog; -import de.danoeh.antennapod.feed.FeedManager; import de.danoeh.antennapod.preferences.UserPreferences; import de.danoeh.antennapod.service.PlaybackService; import de.danoeh.antennapod.util.Converter; @@ -38,8 +37,6 @@ public abstract class MediaplayerActivity extends ActionBarActivity implements OnSeekBarChangeListener { private static final String TAG = "MediaplayerActivity"; - protected FeedManager manager; - protected PlaybackController controller; protected TextView txtvPosition; @@ -148,7 +145,6 @@ public abstract class MediaplayerActivity extends ActionBarActivity StorageUtils.checkStorageAvailability(this); orientation = getResources().getConfiguration().orientation; - manager = FeedManager.getInstance(); getWindow().setFormat(PixelFormat.TRANSPARENT); getSupportActionBar().setDisplayHomeAsUpEnabled(true); } |