diff options
Diffstat (limited to 'src/de/danoeh/antennapod/activity/MediaplayerActivity.java')
| -rw-r--r-- | src/de/danoeh/antennapod/activity/MediaplayerActivity.java | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java index 27ac7afd8..fc70f4c05 100644 --- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -16,7 +16,7 @@ import android.widget.ImageButton; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -import de.danoeh.antennapod.AppConfig; +import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.dialog.TimeDialog; import de.danoeh.antennapod.feed.FeedItem; @@ -135,6 +135,12 @@ public abstract class MediaplayerActivity extends ActionBarActivity public void onPlaybackSpeedChange() { MediaplayerActivity.this.onPlaybackSpeedChange(); } + + @Override + protected void setScreenOn(boolean enable) { + super.setScreenOn(enable); + MediaplayerActivity.this.setScreenOn(enable); + } }; } @@ -151,11 +157,14 @@ public abstract class MediaplayerActivity extends ActionBarActivity setTheme(UserPreferences.getTheme()); } + protected void setScreenOn(boolean enable) { + } + @Override protected void onCreate(Bundle savedInstanceState) { chooseTheme(); super.onCreate(savedInstanceState); - if (AppConfig.DEBUG) + if (BuildConfig.DEBUG) Log.d(TAG, "Creating Activity"); StorageUtils.checkStorageAvailability(this); setVolumeControlStream(AudioManager.STREAM_MUSIC); @@ -213,7 +222,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity @Override protected void onStop() { super.onStop(); - if (AppConfig.DEBUG) + if (BuildConfig.DEBUG) Log.d(TAG, "Activity stopped"); if (controller != null) { controller.release(); @@ -223,7 +232,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity @Override protected void onDestroy() { super.onDestroy(); - if (AppConfig.DEBUG) + if (BuildConfig.DEBUG) Log.d(TAG, "Activity destroyed"); } @@ -243,7 +252,8 @@ public abstract class MediaplayerActivity extends ActionBarActivity menu.findItem(R.id.support_item).setVisible( media != null && media.getPaymentLink() != null && (media instanceof FeedMedia) && - ((FeedMedia) media).getItem().getFlattrStatus().flattrable()); + ((FeedMedia) media).getItem().getFlattrStatus().flattrable() + ); menu.findItem(R.id.share_link_item).setVisible( media != null && media.getWebsiteLink() != null); menu.findItem(R.id.visit_website_item).setVisible( @@ -285,7 +295,8 @@ public abstract class MediaplayerActivity extends ActionBarActivity dialog.dismiss(); controller.disableSleepTimer(); } - }); + } + ); stDialog.setNegativeButton(R.string.cancel_label, new DialogInterface.OnClickListener() { @@ -294,7 +305,8 @@ public abstract class MediaplayerActivity extends ActionBarActivity int which) { dialog.dismiss(); } - }); + } + ); stDialog.create().show(); } break; @@ -343,7 +355,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity @Override protected void onResume() { super.onResume(); - if (AppConfig.DEBUG) + if (BuildConfig.DEBUG) Log.d(TAG, "Resuming Activity"); StorageUtils.checkStorageAvailability(this); controller.init(); @@ -378,7 +390,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity } private void updateProgressbarPosition(int position, int duration) { - if (AppConfig.DEBUG) + if (BuildConfig.DEBUG) Log.d(TAG, "Updating progressbar info"); float progress = ((float) position) / duration; sbPosition.setProgress((int) (progress * sbPosition.getMax())); @@ -391,7 +403,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity * FeedMedia object. */ protected boolean loadMediaInfo() { - if (AppConfig.DEBUG) + if (BuildConfig.DEBUG) Log.d(TAG, "Loading media info"); Playable media = controller.getMedia(); if (media != null) { @@ -451,7 +463,8 @@ public abstract class MediaplayerActivity extends ActionBarActivity dialog.dismiss(); finish(); } - }); + } + ); errorDialog.create().show(); } |