Commit 383966b3 by olly Committed by Oliver Woodman

No-op cleanup for playback controls II

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=132862043
parent 625bb4ed
...@@ -24,13 +24,11 @@ import android.widget.FrameLayout; ...@@ -24,13 +24,11 @@ import android.widget.FrameLayout;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.TextView; import android.widget.TextView;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.R; import com.google.android.exoplayer2.R;
import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.util.Formatter; import java.util.Formatter;
import java.util.Locale; import java.util.Locale;
...@@ -82,9 +80,9 @@ public class PlaybackControlView extends FrameLayout { ...@@ -82,9 +80,9 @@ public class PlaybackControlView extends FrameLayout {
private final Runnable updateProgressAction = new Runnable() { private final Runnable updateProgressAction = new Runnable() {
@Override @Override
public void run() { public void run() {
long pos = updateProgress(); long position = updateProgress();
if (!dragging && isVisible() && isPlaying()) { if (!dragging && isVisible() && isPlaying()) {
postDelayed(updateProgressAction, 1000 - (pos % 1000)); postDelayed(updateProgressAction, 1000 - (position % 1000));
} else { } else {
isProgressUpdating = false; isProgressUpdating = false;
} }
...@@ -147,7 +145,6 @@ public class PlaybackControlView extends FrameLayout { ...@@ -147,7 +145,6 @@ public class PlaybackControlView extends FrameLayout {
updateTime(); updateTime();
} }
/** /**
* Sets the {@link VisibilityListener}. * Sets the {@link VisibilityListener}.
* *
...@@ -248,35 +245,24 @@ public class PlaybackControlView extends FrameLayout { ...@@ -248,35 +245,24 @@ public class PlaybackControlView extends FrameLayout {
previousButton.setVisibility(GONE); previousButton.setVisibility(GONE);
nextButton.setVisibility(GONE); nextButton.setVisibility(GONE);
} else if (player.getCurrentWindowIndex() == 0) { } else if (player.getCurrentWindowIndex() == 0) {
disableView(previousButton); setButtonEnabled(previousButton, false);
enableViews(nextButton); setButtonEnabled(nextButton, true);
} else if (player.getCurrentWindowIndex() == player.getCurrentTimeline().getWindowCount() - 1) { } else if (player.getCurrentWindowIndex() == player.getCurrentTimeline().getWindowCount() - 1) {
enableViews(previousButton); setButtonEnabled(previousButton, true);
disableView(nextButton); setButtonEnabled(nextButton, false);
} else { } else {
enableViews(previousButton, nextButton); setButtonEnabled(previousButton, true);
setButtonEnabled(nextButton, true);
} }
} }
private void disableView(View view) { private void setButtonEnabled(View button, boolean enabled) {
view.setEnabled(false); button.setEnabled(enabled);
if (Util.SDK_INT >= 11) { if (Util.SDK_INT >= 11) {
view.setAlpha(0.3f); button.setAlpha(enabled ? 1f : 0.3f);
view.setVisibility(VISIBLE); button.setVisibility(VISIBLE);
} else { } else {
view.setVisibility(INVISIBLE); button.setVisibility(enabled ? VISIBLE : INVISIBLE);
}
}
private void enableViews(View... views) {
for (View view : views) {
view.setEnabled(true);
if (Util.SDK_INT >= 11) {
view.setAlpha(1f);
view.setVisibility(VISIBLE);
} else {
view.setVisibility(VISIBLE);
}
} }
} }
...@@ -317,9 +303,7 @@ public class PlaybackControlView extends FrameLayout { ...@@ -317,9 +303,7 @@ public class PlaybackControlView extends FrameLayout {
long seconds = totalSeconds % 60; long seconds = totalSeconds % 60;
long minutes = (totalSeconds / 60) % 60; long minutes = (totalSeconds / 60) % 60;
long hours = totalSeconds / 3600; long hours = totalSeconds / 3600;
formatBuilder.setLength(0); formatBuilder.setLength(0);
return hours > 0 ? formatter.format("%d:%02d:%02d", hours, minutes, seconds).toString() return hours > 0 ? formatter.format("%d:%02d:%02d", hours, minutes, seconds).toString()
: formatter.format("%02d:%02d", minutes, seconds).toString(); : formatter.format("%02d:%02d", minutes, seconds).toString();
} }
...@@ -348,8 +332,6 @@ public class PlaybackControlView extends FrameLayout { ...@@ -348,8 +332,6 @@ public class PlaybackControlView extends FrameLayout {
} }
private void rewind() { private void rewind() {
Timeline currentTimeline = player.getCurrentTimeline();
currentTimeline.getWindow(player.getCurrentWindowIndex(), currentWindow);
player.seekTo(Math.max(player.getCurrentPosition() - rewindMs, 0)); player.seekTo(Math.max(player.getCurrentPosition() - rewindMs, 0));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment