Constrain DefaultTimeBar maximum positions

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=156113616

Constrain DefaultTimeBar maximum positions
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=156113616
84875bbe · andrewlewis · Oliver Woodman · b31ec337 · 84875bbe
Commit 84875bbe authored May 15, 2017 by andrewlewis Committed by Oliver Woodman May 17, 2017
Showing with 4 additions and 6 deletions
library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
@@ -465,12 +465,10 @@ public class DefaultTimeBar extends View implements TimeBar {
    scrubberBar.set(progressBar);
    long newScrubberTime = scrubbing ? scrubPosition : position;
    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 {
      bufferedBar.right = progressBar.left;
      scrubberBar.right = progressBar.left;