diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2012-07-27 14:59:01 +0200 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2012-07-27 14:59:01 +0200 |
commit | e23c1a0143996784f2c9c7563ae45445403be501 (patch) | |
tree | 561bb28eee38ddd7341b3f28da3e95745fe0c9e5 /src/de/danoeh/antennapod/activity | |
parent | 791acc935c483fe096c69a01fd6c9abcf1b3e916 (diff) | |
download | AntennaPod-e23c1a0143996784f2c9c7563ae45445403be501.zip |
Implemented sleep timer menu item + fixed problems with dialog
Diffstat (limited to 'src/de/danoeh/antennapod/activity')
-rw-r--r-- | src/de/danoeh/antennapod/activity/MediaplayerActivity.java | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java index 81ebceb62..39ec5c990 100644 --- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -47,6 +47,7 @@ import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.PodcastApp; import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.SCListAdapter; +import de.danoeh.antennapod.dialog.TimeDialog; import de.danoeh.antennapod.feed.FeedManager; import de.danoeh.antennapod.feed.FeedMedia; import de.danoeh.antennapod.feed.SimpleChapter; @@ -142,9 +143,11 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements media != null && media.getItem().getLink() != null); menu.findItem(R.id.visit_website_item).setVisible( media != null && media.getItem().getLink() != null); - - boolean sleepTimerSet = playbackService != null && playbackService.sleepTimerActive(); - boolean sleepTimerNotSet = playbackService != null && !playbackService.sleepTimerActive(); + + boolean sleepTimerSet = playbackService != null + && playbackService.sleepTimerActive(); + boolean sleepTimerNotSet = playbackService != null + && !playbackService.sleepTimerActive(); menu.findItem(R.id.set_sleeptimer_item).setVisible(sleepTimerNotSet); menu.findItem(R.id.disable_sleeptimer_item).setVisible(sleepTimerSet); return true; @@ -157,6 +160,28 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements startActivity(new Intent(MediaplayerActivity.this, MainActivity.class)); break; + case R.id.disable_sleeptimer_item: + if (playbackService != null) { + playbackService.disableSleepTimer(); + } + break; + case R.id.set_sleeptimer_item: + if (playbackService != null) { + TimeDialog td = new TimeDialog(this, + R.string.set_sleeptimer_label, + R.string.set_sleeptimer_label) { + + @Override + public void onTimeEntered(long millis) { + if (playbackService != null) { + playbackService.setSleepTimer(millis); + } + } + }; + td.show(); + break; + + } default: return FeedItemMenuHandler.onMenuItemClicked(this, item, media.getItem()); @@ -643,6 +668,9 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements queryService(); break; + case PlaybackService.NOTIFICATION_TYPE_SLEEPTIMER_UPDATE: + invalidateOptionsMenu(); + break; } } else { |