From cb45a47da18f3c7867abc2b61a8b3f15f151bd89 Mon Sep 17 00:00:00 2001 From: tonihei Date: Mon, 21 Aug 2017 03:49:38 -0700 Subject: [PATCH] Remove isFirstWindow/isLastWindow from Timeline. These methods are only used in one place, and offer duplicate functionality to checking getNext(Previous)WindowIndex == C.INDEX_UNSET. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=165910258 --- .../google/android/exoplayer2/Timeline.java | 24 ------------------- .../exoplayer2/ui/PlaybackControlView.java | 7 +++--- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java index 414c0804ad..7d4c1995eb 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java @@ -593,30 +593,6 @@ public abstract class Timeline { } } - /** - * Returns whether the given window is the last window of the timeline depending on the - * {@code repeatMode}. - * - * @param windowIndex A window index. - * @param repeatMode A repeat mode. - * @return Whether the window of the given index is the last window of the timeline. - */ - public final boolean isLastWindow(int windowIndex, @Player.RepeatMode int repeatMode) { - return getNextWindowIndex(windowIndex, repeatMode) == C.INDEX_UNSET; - } - - /** - * Returns whether the given window is the first window of the timeline depending on the - * {@code repeatMode}. - * - * @param windowIndex A window index. - * @param repeatMode A repeat mode. - * @return Whether the window of the given index is the first window of the timeline. - */ - public final boolean isFirstWindow(int windowIndex, @Player.RepeatMode int repeatMode) { - return getPreviousWindowIndex(windowIndex, repeatMode) == C.INDEX_UNSET; - } - /** * Populates a {@link Window} with data for the window at the specified index. Does not populate * {@link Window#id}. diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java index a53e133562..54212eefdd 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java @@ -674,9 +674,10 @@ public class PlaybackControlView extends FrameLayout { int windowIndex = player.getCurrentWindowIndex(); timeline.getWindow(windowIndex, window); isSeekable = window.isSeekable; - enablePrevious = !timeline.isFirstWindow(windowIndex, player.getRepeatMode()) - || isSeekable || !window.isDynamic; - enableNext = !timeline.isLastWindow(windowIndex, player.getRepeatMode()) || window.isDynamic; + enablePrevious = isSeekable || !window.isDynamic + || timeline.getPreviousWindowIndex(windowIndex, player.getRepeatMode()) != C.INDEX_UNSET; + enableNext = window.isDynamic + || timeline.getNextWindowIndex(windowIndex, player.getRepeatMode()) != C.INDEX_UNSET; if (player.isPlayingAd()) { // Always hide player controls during ads. hide();