Constrain DefaultTimeBar maximum positions

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=156113616
This commit is contained in:
andrewlewis 2017-05-15 15:36:20 -07:00 committed by Oliver Woodman
parent ecc4184e6c
commit a0f4bf0ee1

View File

@ -465,12 +465,10 @@ public class DefaultTimeBar extends View implements TimeBar {
scrubberBar.set(progressBar); scrubberBar.set(progressBar);
long newScrubberTime = scrubbing ? scrubPosition : position; long newScrubberTime = scrubbing ? scrubPosition : position;
if (duration > 0) { if (duration > 0) {
int bufferedPixelWidth = int bufferedPixelWidth = (int) ((progressBar.width() * bufferedPosition) / duration);
(int) ((progressBar.width() * bufferedPosition) / duration); bufferedBar.right = Math.min(progressBar.left + bufferedPixelWidth, progressBar.right);
bufferedBar.right = progressBar.left + bufferedPixelWidth; int scrubberPixelPosition = (int) ((progressBar.width() * newScrubberTime) / duration);
int scrubberPixelPosition = scrubberBar.right = Math.min(progressBar.left + scrubberPixelPosition, progressBar.right);
(int) ((progressBar.width() * newScrubberTime) / duration);
scrubberBar.right = progressBar.left + scrubberPixelPosition;
} else { } else {
bufferedBar.right = progressBar.left; bufferedBar.right = progressBar.left;
scrubberBar.right = progressBar.left; scrubberBar.right = progressBar.left;