Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use cancel button and enable swipe on 5.0+

This commit is contained in:
Tom Hennen 2015-09-25 17:56:11 -04:00
parent 118285e8a2
commit 754c1f4b37
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -2,6 +2,7 @@ package de.danoeh.antennapod.core.service.playback;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.app.Service; import android.app.Service;
import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothA2dp;
@ -867,7 +868,7 @@ public class PlaybackService extends Service {
PlaybackService.this) PlaybackService.this)
.setContentTitle(contentTitle) .setContentTitle(contentTitle)
.setContentText(contentText) .setContentText(contentText)
.setOngoing(true) .setOngoing(false)
.setContentIntent(pIntent) .setContentIntent(pIntent)
.setLargeIcon(icon) .setLargeIcon(icon)
.setSmallIcon(smallIcon) .setSmallIcon(smallIcon)
@ -891,23 +892,26 @@ public class PlaybackService extends Service {
skipButtonPendingIntent); skipButtonPendingIntent);
actionList.add(actionList.size()); actionList.add(actionList.size());
} }
if (UserPreferences.isPersistNotify()) {
notificationBuilder.addAction(android.R.drawable.ic_menu_close_clear_cancel, // stop action
getString(R.string.stop_label),
stopButtonPendingIntent);
actionList.add(actionList.size());
}
notificationBuilder.setStyle(new android.support.v7.app.NotificationCompat.MediaStyle() notificationBuilder.setStyle(new android.support.v7.app.NotificationCompat.MediaStyle()
.setMediaSession(mediaPlayer.getSessionToken()) .setMediaSession(mediaPlayer.getSessionToken())
.setShowActionsInCompactView(actionList.toArray()) .setShowActionsInCompactView(actionList.toArray())
.setShowCancelButton(true)) .setShowCancelButton(true)
.setCancelButtonIntent(stopButtonPendingIntent))
.setVisibility(Notification.VISIBILITY_PUBLIC) .setVisibility(Notification.VISIBILITY_PUBLIC)
.setColor(Notification.COLOR_DEFAULT); .setColor(Notification.COLOR_DEFAULT);
notification = notificationBuilder.build(); notification = notificationBuilder.build();
if (playerStatus == PlayerStatus.PLAYING ||
playerStatus == PlayerStatus.PREPARING ||
playerStatus == PlayerStatus.SEEKING) {
startForeground(NOTIFICATION_ID, notification); startForeground(NOTIFICATION_ID, notification);
} else {
stopForeground(false);
NotificationManager mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
mNotificationManager.notify(NOTIFICATION_ID, notification);
}
Log.d(TAG, "Notification set up"); Log.d(TAG, "Notification set up");
} }
} }