From 59f22abb3e8ce75968030152175221bf3a24c907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= <ferjmoreno@gmail.com>
Date: Mon, 18 Nov 2019 11:54:49 +0100
Subject: [PATCH] Remove stop button for now and show play/pause in compact
 mode

---
 .../java/org/mozilla/servo/MediaSession.java     | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MediaSession.java b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MediaSession.java
index 6444dff4d99..5b1852d5d3f 100644
--- a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MediaSession.java
+++ b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MediaSession.java
@@ -101,7 +101,6 @@ public class MediaSession {
       if (mPlaybackState == PLAYBACK_STATE_PLAYING) {
         filter.addAction(KEY_MEDIA_PAUSE);
       }
-      filter.addAction(KEY_MEDIA_STOP);
 
       int id;
       if (mMediaSessionActionReceiver == null) {
@@ -116,9 +115,6 @@ public class MediaSession {
             } else if (intent.getAction().equals(KEY_MEDIA_PLAY)) {
               mView.mediaSessionAction(ACTION_PLAY);
               Log.d("MediaSession", "PLAY action");
-            } else if (intent.getAction().equals(KEY_MEDIA_STOP)) {
-              mView.mediaSessionAction(ACTION_STOP);
-              Log.d("MediaSession", "STOP action");
             }
           }
         };
@@ -128,18 +124,11 @@ public class MediaSession {
 
       mContext.registerReceiver(mMediaSessionActionReceiver, filter);
 
-      Intent stopIntent = new Intent(KEY_MEDIA_STOP);
-      Notification.Action stopAction =
-        new Notification.Action(R.drawable.media_session_stop, "Stop",
-          PendingIntent.getBroadcast(mContext, 0, stopIntent, 0));
-
       Notification.Builder builder = new Notification.Builder(mContext, this.MEDIA_CHANNEL_ID);
       builder
         .setSmallIcon(R.drawable.media_session_icon)
         .setContentTitle(mTitle)
-        .setVisibility(Notification.VISIBILITY_PUBLIC)
-        .addAction(stopAction)
-        .setStyle(new Notification.MediaStyle());
+        .setVisibility(Notification.VISIBILITY_PUBLIC);
 
       String contentText = new String();
       if (mArtist != null && !mArtist.isEmpty()) {
@@ -173,6 +162,9 @@ public class MediaSession {
         builder.addAction(pauseAction);
       }
 
+      builder.setStyle(new Notification.MediaStyle()
+        .setShowActionsInCompactView(0));
+
       NotificationManager notificationManager =
         mContext.getSystemService(NotificationManager.class);
       notificationManager.notify(id, builder.build());