Revert cab1dc8fdd6235d1ade4733a627b870187190806 (while fixing conflicts).

The majority of people do not seem to like this feature, so lets go back to our old behaviour.
This commit is contained in:
Adrian Ulrich 2017-09-07 21:31:20 +02:00
parent 65fc2929b6
commit 073896639a

View File

@ -2127,23 +2127,8 @@ public final class PlaybackService extends Service
notification.priority = Notification.PRIORITY_HIGH;
}
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
RemoteViews viewsPublic = new RemoteViews(getPackageName(), R.layout.notification);
viewsPublic.setInt(R.id.title, "setText", R.string.app_name);
viewsPublic.setImageViewResource(R.id.cover, R.drawable.icon);
viewsPublic.setImageViewResource(R.id.play_pause, playButton);
viewsPublic.setOnClickPendingIntent(R.id.previous, PendingIntent.getService(this, 0, previous, 0));
viewsPublic.setOnClickPendingIntent(R.id.play_pause, PendingIntent.getService(this, 0, playPause, 0));
viewsPublic.setOnClickPendingIntent(R.id.next, PendingIntent.getService(this, 0, next, 0));
viewsPublic.setOnClickPendingIntent(R.id.close, PendingIntent.getService(this, 0, close, 0));
viewsPublic.setViewVisibility(R.id.close, closeButtonVisibility);
Notification notificationPublic = notification.clone();
notificationPublic.contentView = viewsPublic;
notification.publicVersion = notificationPublic;
notification.visibility = Notification.VISIBILITY_PUBLIC;
}
if(mNotificationNag) {
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
notification.priority = Notification.PRIORITY_MAX;