From 6bceec3246fcd2088eb1e76aa631c65bdf68de55 Mon Sep 17 00:00:00 2001 From: jaewan Date: Mon, 6 Dec 2021 15:51:11 +0000 Subject: [PATCH] Remove setters for showing actions in Notification PiperOrigin-RevId: 414441471 --- .../session/PlayerNotificationManager.java | 245 +----------------- 1 file changed, 10 insertions(+), 235 deletions(-) diff --git a/libraries/session/src/main/java/androidx/media3/session/PlayerNotificationManager.java b/libraries/session/src/main/java/androidx/media3/session/PlayerNotificationManager.java index cbaf7acf25..b6cd88e07e 100644 --- a/libraries/session/src/main/java/androidx/media3/session/PlayerNotificationManager.java +++ b/libraries/session/src/main/java/androidx/media3/session/PlayerNotificationManager.java @@ -76,66 +76,6 @@ import java.util.Map; *

If the player is released it must be removed from the manager by calling {@code * setPlayer(null)}. * - *

Action customization

- * - * Playback actions can be included or omitted as follows: - * - * - * *

Overriding drawables

* * The drawables used by PlayerNotificationManager can be overridden by drawables with the same @@ -662,15 +602,6 @@ public class PlayerNotificationManager { private boolean isNotificationStarted; private int currentNotificationTag; @Nullable private MediaSessionCompat.Token mediaSessionToken; - private boolean usePreviousAction; - private boolean useNextAction; - private boolean usePreviousActionInCompactView; - private boolean useNextActionInCompactView; - private boolean useRewindAction; - private boolean useFastForwardAction; - private boolean useRewindActionInCompactView; - private boolean useFastForwardActionInCompactView; - private boolean usePlayPauseActions; private int badgeIconType; private boolean colorized; private int defaults; @@ -716,11 +647,6 @@ public class PlayerNotificationManager { playerListener = new PlayerListener(); notificationBroadcastReceiver = new NotificationBroadcastReceiver(); intentFilter = new IntentFilter(); - usePreviousAction = true; - useNextAction = true; - usePlayPauseActions = true; - useRewindAction = true; - useFastForwardAction = true; colorized = true; useChronometer = true; color = Color.TRANSPARENT; @@ -787,146 +713,6 @@ public class PlayerNotificationManager { } } - /** - * Sets whether the next action should be used. - * - * @param useNextAction Whether to use the next action. - */ - public final void setUseNextAction(boolean useNextAction) { - if (this.useNextAction != useNextAction) { - this.useNextAction = useNextAction; - invalidate(); - } - } - - /** - * Sets whether the previous action should be used. - * - * @param usePreviousAction Whether to use the previous action. - */ - public final void setUsePreviousAction(boolean usePreviousAction) { - if (this.usePreviousAction != usePreviousAction) { - this.usePreviousAction = usePreviousAction; - invalidate(); - } - } - - /** - * If {@link #setUseNextAction useNextAction} is {@code true}, sets whether the next action should - * also be used in compact view. Has no effect if {@link #setUseNextAction useNextAction} is - * {@code false}. - * - *

If set to {@code true}, {@link #setUseFastForwardActionInCompactView(boolean) - * setUseFastForwardActionInCompactView} is set to false. - * - * @param useNextActionInCompactView Whether to use the next action in compact view. - */ - public final void setUseNextActionInCompactView(boolean useNextActionInCompactView) { - if (this.useNextActionInCompactView != useNextActionInCompactView) { - this.useNextActionInCompactView = useNextActionInCompactView; - if (useNextActionInCompactView) { - useFastForwardActionInCompactView = false; - } - invalidate(); - } - } - - /** - * If {@link #setUsePreviousAction usePreviousAction} is {@code true}, sets whether the previous - * action should also be used in compact view. Has no effect if {@link #setUsePreviousAction - * usePreviousAction} is {@code false}. - * - *

If set to {@code true}, {@link #setUseRewindActionInCompactView(boolean) - * setUseRewindActionInCompactView} is set to false. - * - * @param usePreviousActionInCompactView Whether to use the previous action in compact view. - */ - public final void setUsePreviousActionInCompactView(boolean usePreviousActionInCompactView) { - if (this.usePreviousActionInCompactView != usePreviousActionInCompactView) { - this.usePreviousActionInCompactView = usePreviousActionInCompactView; - if (usePreviousActionInCompactView) { - useRewindActionInCompactView = false; - } - invalidate(); - } - } - - /** - * Sets whether the fast forward action should be used. - * - * @param useFastForwardAction Whether to use the fast forward action. - */ - public final void setUseFastForwardAction(boolean useFastForwardAction) { - if (this.useFastForwardAction != useFastForwardAction) { - this.useFastForwardAction = useFastForwardAction; - invalidate(); - } - } - - /** - * Sets whether the rewind action should be used. - * - * @param useRewindAction Whether to use the rewind action. - */ - public final void setUseRewindAction(boolean useRewindAction) { - if (this.useRewindAction != useRewindAction) { - this.useRewindAction = useRewindAction; - invalidate(); - } - } - - /** - * Sets whether the fast forward action should also be used in compact view. Has no effect if - * {@link #ACTION_FAST_FORWARD} is not enabled, for instance if the media is not seekable. - * - *

If set to {@code true}, {@link #setUseNextActionInCompactView(boolean) - * setUseNextActionInCompactView} is set to false. - * - * @param useFastForwardActionInCompactView Whether to use the fast forward action in compact - * view. - */ - public final void setUseFastForwardActionInCompactView( - boolean useFastForwardActionInCompactView) { - if (this.useFastForwardActionInCompactView != useFastForwardActionInCompactView) { - this.useFastForwardActionInCompactView = useFastForwardActionInCompactView; - if (useFastForwardActionInCompactView) { - useNextActionInCompactView = false; - } - invalidate(); - } - } - - /** - * Sets whether the rewind action should also be used in compact view. Has no effect if {@link - * #ACTION_REWIND} is not enabled, for instance if the media is not seekable. - * - *

If set to {@code true}, {@link #setUsePreviousActionInCompactView(boolean) - * setUsePreviousActionInCompactView} is set to false. - * - * @param useRewindActionInCompactView Whether to use the rewind action in compact view. - */ - public final void setUseRewindActionInCompactView(boolean useRewindActionInCompactView) { - if (this.useRewindActionInCompactView != useRewindActionInCompactView) { - this.useRewindActionInCompactView = useRewindActionInCompactView; - if (useRewindActionInCompactView) { - usePreviousActionInCompactView = false; - } - invalidate(); - } - } - - /** - * Sets whether the play and pause actions should be used. - * - * @param usePlayPauseActions Whether to use play and pause actions. - */ - public final void setUsePlayPauseActions(boolean usePlayPauseActions) { - if (this.usePlayPauseActions != usePlayPauseActions) { - this.usePlayPauseActions = usePlayPauseActions; - invalidate(); - } - } - /** * Sets the {@link MediaSessionCompat.Token}. * @@ -1272,28 +1058,23 @@ public class PlayerNotificationManager { boolean enableNext = player.isCommandAvailable(COMMAND_SEEK_TO_NEXT); List stringActions = new ArrayList<>(); - if (usePreviousAction && enablePrevious) { + if (enablePrevious) { stringActions.add(ACTION_PREVIOUS); } - if (useRewindAction && enableRewind) { + if (enableRewind) { stringActions.add(ACTION_REWIND); } - if (usePlayPauseActions) { - if (shouldShowPauseButton(player)) { - stringActions.add(ACTION_PAUSE); - } else { - stringActions.add(ACTION_PLAY); - } + if (shouldShowPauseButton(player)) { + stringActions.add(ACTION_PAUSE); + } else { + stringActions.add(ACTION_PLAY); } - if (useFastForwardAction && enableFastForward) { + if (enableFastForward) { stringActions.add(ACTION_FAST_FORWARD); } - if (useNextAction && enableNext) { + if (enableNext) { stringActions.add(ACTION_NEXT); } - if (customActionReceiver != null) { - stringActions.addAll(customActionReceiver.getCustomActions(player)); - } return stringActions; } @@ -1310,14 +1091,8 @@ public class PlayerNotificationManager { protected int[] getActionIndicesForCompactView(List actionNames, Player player) { int pauseActionIndex = actionNames.indexOf(ACTION_PAUSE); int playActionIndex = actionNames.indexOf(ACTION_PLAY); - int leftSideActionIndex = - usePreviousActionInCompactView - ? actionNames.indexOf(ACTION_PREVIOUS) - : (useRewindActionInCompactView ? actionNames.indexOf(ACTION_REWIND) : -1); - int rightSideActionIndex = - useNextActionInCompactView - ? actionNames.indexOf(ACTION_NEXT) - : (useFastForwardActionInCompactView ? actionNames.indexOf(ACTION_FAST_FORWARD) : -1); + int leftSideActionIndex = actionNames.indexOf(ACTION_PREVIOUS); + int rightSideActionIndex = actionNames.indexOf(ACTION_NEXT); int[] actionIndices = new int[3]; int actionCounter = 0;