From 073896639a6d71e3811e34ff554f4c040af225d6 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Thu, 7 Sep 2017 21:31:20 +0200 Subject: [PATCH] Revert cab1dc8fdd6235d1ade4733a627b870187190806 (while fixing conflicts). The majority of people do not seem to like this feature, so lets go back to our old behaviour. --- .../android/vanilla/PlaybackService.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java index f613aacf..edc1fdfc 100644 --- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java +++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java @@ -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;