summaryrefslogtreecommitdiff
path: root/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
diff options
context:
space:
mode:
authordaniel oeh <daniel.oeh@gmail.com>2014-03-28 20:38:01 +0100
committerdaniel oeh <daniel.oeh@gmail.com>2014-03-28 20:38:01 +0100
commit1048939f69a1924a8a9509b493a2f0ed46648941 (patch)
tree876791608cebb6232b5c912b3ac5d49c1dd8c15d /src/de/danoeh/antennapod/activity/MediaplayerActivity.java
parentae09dbffb6746641a5658750085af08f5ff60e47 (diff)
downloadAntennaPod-1048939f69a1924a8a9509b493a2f0ed46648941.zip
Enable screen timeout when video is paused. closes #368
Diffstat (limited to 'src/de/danoeh/antennapod/activity/MediaplayerActivity.java')
-rw-r--r--src/de/danoeh/antennapod/activity/MediaplayerActivity.java21
1 files changed, 17 insertions, 4 deletions
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 27ac7afd8..8e659af14 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -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,6 +157,9 @@ public abstract class MediaplayerActivity extends ActionBarActivity
setTheme(UserPreferences.getTheme());
}
+ protected void setScreenOn(boolean enable) {
+ }
+
@Override
protected void onCreate(Bundle savedInstanceState) {
chooseTheme();
@@ -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;
@@ -451,7 +463,8 @@ public abstract class MediaplayerActivity extends ActionBarActivity
dialog.dismiss();
finish();
}
- });
+ }
+ );
errorDialog.create().show();
}