Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove prev and next track action buttons for now

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-11-13 11:05:35 +01:00
parent b048d7faf7
commit b5b8c6c2a8
2 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/script/dom/mediasession.rs
View file

@ -18,7 +18,6 @@ use crate::dom::mediametadata::MediaMetadata;
use crate::dom::window::Window; use crate::dom::window::Window;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use embedder_traits::MediaSessionEvent; use embedder_traits::MediaSessionEvent;
use msg::constellation_msg::PipelineId;
use script_traits::MediaSessionActionType; use script_traits::MediaSessionActionType;
use script_traits::ScriptMsg; use script_traits::ScriptMsg;
use std::collections::HashMap; use std::collections::HashMap;

24
support/android/apk/servoapp/src/main/java/org/mozilla/servo/MediaSession.java
View file

@ -88,8 +88,6 @@ public class MediaSession {
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(KEY_MEDIA_PAUSE); filter.addAction(KEY_MEDIA_PAUSE);
filter.addAction(KEY_MEDIA_STOP); filter.addAction(KEY_MEDIA_STOP);
filter.addAction(KEY_MEDIA_PREV);
filter.addAction(KEY_MEDIA_NEXT);
mMediaSessionActionReceiver = new BroadcastReceiver() { mMediaSessionActionReceiver = new BroadcastReceiver() {
@Override @Override
@ -100,12 +98,6 @@ public class MediaSession {
} else if (intent.getAction().equals(KEY_MEDIA_STOP)) { } else if (intent.getAction().equals(KEY_MEDIA_STOP)) {
mView.mediaSessionAction(ACTION_STOP); mView.mediaSessionAction(ACTION_STOP);
Log.d("SERVOMEDIA", "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", new Notification.Action(R.drawable.media_session_pause, "Pause",
PendingIntent.getBroadcast(mContext, 0, pauseIntent, 0)); 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); Intent stopIntent = new Intent(KEY_MEDIA_STOP);
Notification.Action stopAction = Notification.Action stopAction =
new Notification.Action(R.drawable.media_session_stop, "Stop", new Notification.Action(R.drawable.media_session_stop, "Stop",
@ -137,13 +119,11 @@ public class MediaSession {
.setSmallIcon(R.drawable.media_session_icon) .setSmallIcon(R.drawable.media_session_icon)
.setContentTitle("This is the notification title") .setContentTitle("This is the notification title")
.setVisibility(Notification.VISIBILITY_PUBLIC) .setVisibility(Notification.VISIBILITY_PUBLIC)
.addAction(prevAction)
.addAction(pauseAction) .addAction(pauseAction)
.addAction(nextAction)
.addAction(stopAction) .addAction(stopAction)
.setStyle(new Notification.MediaStyle() .setStyle(new Notification.MediaStyle()
.setShowActionsInCompactView(1 /* pause button */ ) .setShowActionsInCompactView(0 /* pause button */ )
.setShowActionsInCompactView(3 /* stop button */)); .setShowActionsInCompactView(1 /* stop button */));
NotificationManager notificationManager = NotificationManager notificationManager =
mContext.getSystemService(NotificationManager.class); mContext.getSystemService(NotificationManager.class);