diff options
| author | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2019-11-13 11:05:35 +0100 |
|---|---|---|
| committer | Fernando Jiménez Moreno <ferjmoreno@gmail.com> | 2019-11-20 13:34:29 +0100 |
| commit | b5b8c6c2a8b41c9829af52f22e685dfae249c5e3 (patch) | |
| tree | 4f0cabfa0c8f707081c0e9357658854dbd66419e | |
| parent | b048d7faf717bb5ac90f02301b567b25d37681f3 (diff) | |
| download | servo-b5b8c6c2a8b41c9829af52f22e685dfae249c5e3.tar.gz servo-b5b8c6c2a8b41c9829af52f22e685dfae249c5e3.zip | |
Remove prev and next track action buttons for now
| -rw-r--r-- | components/script/dom/mediasession.rs | 1 | ||||
| -rw-r--r-- | support/android/apk/servoapp/src/main/java/org/mozilla/servo/MediaSession.java | 24 |
2 files changed, 2 insertions, 23 deletions
diff --git a/components/script/dom/mediasession.rs b/components/script/dom/mediasession.rs index f0d0bcbca43..868565f540c 100644 --- a/components/script/dom/mediasession.rs +++ b/components/script/dom/mediasession.rs @@ -18,7 +18,6 @@ use crate::dom::mediametadata::MediaMetadata; use crate::dom::window::Window; use dom_struct::dom_struct; use embedder_traits::MediaSessionEvent; -use msg::constellation_msg::PipelineId; use script_traits::MediaSessionActionType; use script_traits::ScriptMsg; use std::collections::HashMap; 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 ce8d1e6315a..b1f8c3794de 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 @@ -88,8 +88,6 @@ public class MediaSession { IntentFilter filter = new IntentFilter(); filter.addAction(KEY_MEDIA_PAUSE); filter.addAction(KEY_MEDIA_STOP); - filter.addAction(KEY_MEDIA_PREV); - filter.addAction(KEY_MEDIA_NEXT); mMediaSessionActionReceiver = new BroadcastReceiver() { @Override @@ -100,12 +98,6 @@ public class MediaSession { } else if (intent.getAction().equals(KEY_MEDIA_STOP)) { mView.mediaSessionAction(ACTION_STOP); Log.d("SERVOMEDIA", "STOP"); - } else if (intent.getAction().equals(KEY_MEDIA_NEXT)) { - mView.mediaSessionAction(ACTION_NEXT_TRACK); - Log.d("SERVOMEDIA", "NEXT"); - } else if (intent.getAction().equals(KEY_MEDIA_PREV)) { - mView.mediaSessionAction(ACTION_PREVIOUS_TRACK); - Log.d("SERVOMEDIA", "PREV"); } } }; @@ -117,16 +109,6 @@ public class MediaSession { new Notification.Action(R.drawable.media_session_pause, "Pause", PendingIntent.getBroadcast(mContext, 0, pauseIntent, 0)); - Intent nextIntent = new Intent(KEY_MEDIA_NEXT); - Notification.Action nextAction = - new Notification.Action(R.drawable.media_session_next, "Next", - PendingIntent.getBroadcast(mContext, 0, nextIntent, 0)); - - Intent prevIntent = new Intent(KEY_MEDIA_PREV); - Notification.Action prevAction = - new Notification.Action(R.drawable.media_session_prev, "Previous", - PendingIntent.getBroadcast(mContext, 0, prevIntent, 0)); - Intent stopIntent = new Intent(KEY_MEDIA_STOP); Notification.Action stopAction = new Notification.Action(R.drawable.media_session_stop, "Stop", @@ -137,13 +119,11 @@ public class MediaSession { .setSmallIcon(R.drawable.media_session_icon) .setContentTitle("This is the notification title") .setVisibility(Notification.VISIBILITY_PUBLIC) - .addAction(prevAction) .addAction(pauseAction) - .addAction(nextAction) .addAction(stopAction) .setStyle(new Notification.MediaStyle() - .setShowActionsInCompactView(1 /* pause button */ ) - .setShowActionsInCompactView(3 /* stop button */)); + .setShowActionsInCompactView(0 /* pause button */ ) + .setShowActionsInCompactView(1 /* stop button */)); NotificationManager notificationManager = mContext.getSystemService(NotificationManager.class); |