From c70cd37c5a28e6b7fa2e9b87c032ff5a2b501ee4 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 8 May 2017 09:19:56 -0700
Subject: [PATCH] Repeat mode UI

Added repeat mode toggle buttons to UI. Current mode gets forwarded to
Exoplayer instance, but without playback behaviour changes yet.
Translations for button descriptions are also missing - this will be another CL.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=155386549
---
 .../android/exoplayer2/demo/EventLogger.java  |   4 +
 .../google/android/exoplayer2/ExoPlayer.java  |  10 +-
 .../exoplayer2/ui/PlaybackControlView.java    | 171 +++++++++++++++++-
 .../exoplayer2/ui/SimpleExoPlayerView.java    |  10 +
 .../exo_controls_repeat_all.xml               |  23 +++
 .../exo_controls_repeat_off.xml               |  23 +++
 .../exo_controls_repeat_one.xml               |  23 +++
 .../drawable-hdpi/exo_controls_repeat_all.png | Bin 0 -> 203 bytes
 .../drawable-hdpi/exo_controls_repeat_off.png | Bin 0 -> 223 bytes
 .../drawable-hdpi/exo_controls_repeat_one.png | Bin 0 -> 223 bytes
 .../drawable-ldpi/exo_controls_repeat_all.png | Bin 0 -> 142 bytes
 .../drawable-ldpi/exo_controls_repeat_off.png | Bin 0 -> 166 bytes
 .../drawable-ldpi/exo_controls_repeat_one.png | Bin 0 -> 160 bytes
 .../drawable-mdpi/exo_controls_repeat_all.png | Bin 0 -> 210 bytes
 .../drawable-mdpi/exo_controls_repeat_off.png | Bin 0 -> 227 bytes
 .../drawable-mdpi/exo_controls_repeat_one.png | Bin 0 -> 232 bytes
 .../exo_controls_repeat_all.png               | Bin 0 -> 288 bytes
 .../exo_controls_repeat_off.png               | Bin 0 -> 322 bytes
 .../exo_controls_repeat_one.png               | Bin 0 -> 331 bytes
 .../exo_controls_repeat_all.png               | Bin 0 -> 266 bytes
 .../exo_controls_repeat_off.png               | Bin 0 -> 309 bytes
 .../exo_controls_repeat_one.png               | Bin 0 -> 309 bytes
 .../res/layout/exo_playback_control_view.xml  |   3 +
 library/ui/src/main/res/values/attrs.xml      |   6 +
 library/ui/src/main/res/values/ids.xml        |   1 +
 25 files changed, 272 insertions(+), 2 deletions(-)
 create mode 100644 library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_all.xml
 create mode 100644 library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_off.xml
 create mode 100644 library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_one.xml
 create mode 100644 library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_all.png
 create mode 100644 library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_off.png
 create mode 100644 library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_one.png
 create mode 100644 library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_all.png
 create mode 100644 library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_off.png
 create mode 100644 library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_one.png
 create mode 100644 library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_all.png
 create mode 100644 library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_off.png
 create mode 100644 library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_one.png
 create mode 100644 library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_all.png
 create mode 100644 library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_off.png
 create mode 100644 library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_one.png
 create mode 100644 library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_all.png
 create mode 100644 library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_off.png
 create mode 100644 library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_one.png

diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
index 0d77624a7b..686718f9e0 100644
--- a/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
+++ b/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
@@ -470,6 +470,10 @@ import java.util.Locale;
     switch (repeatMode) {
       case ExoPlayer.REPEAT_MODE_OFF:
         return "OFF";
+      case ExoPlayer.REPEAT_MODE_ONE:
+        return "ONE";
+      case ExoPlayer.REPEAT_MODE_ALL:
+        return "ALL";
       default:
         return "?";
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 6327ebd9c2..8e16de5fca 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -268,12 +268,20 @@ public interface ExoPlayer {
    * Repeat modes for playback.
    */
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({REPEAT_MODE_OFF})
+  @IntDef({REPEAT_MODE_OFF, REPEAT_MODE_ONE, REPEAT_MODE_ALL})
   public @interface RepeatMode {}
   /**
    * Normal playback without repetition.
    */
   int REPEAT_MODE_OFF = 0;
+  /**
+   * "Repeat One" mode to repeat the currently playing window infinitely.
+   */
+  int REPEAT_MODE_ONE = 1;
+  /**
+   * "Repeat All" mode to repeat the entire timeline infinitely.
+   */
+  int REPEAT_MODE_ALL = 2;
 
   /**
    * Register a listener to receive events from the player. The listener's methods will be called on
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 ae5b7c8b13..337cb47b1e 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
@@ -18,13 +18,17 @@ package com.google.android.exoplayer2.ui;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
+import android.support.annotation.IntDef;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -35,6 +39,8 @@ import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
 import java.util.Formatter;
 import java.util.Locale;
@@ -70,6 +76,14 @@ import java.util.Locale;
  *         <li>Default: {@link #DEFAULT_FAST_FORWARD_MS}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code repeat_toggle_modes}</b> - A flagged enumeration value specifying which repeat
+ *       mode toggle options are enabled. Valid values are: {@code none}, {@code one},
+ *       {@code all}, or {@code one|all}.
+ *       <ul>
+ *         <li>Corresponding method: {@link #setRepeatToggleModes(int)}</li>
+ *         <li>Default: {@link #DEFAULT_REPEAT_TOGGLE_MODES}</li>
+ *       </ul>
+ *   </li>
  *   <li><b>{@code controller_layout_id}</b> - Specifies the id of the layout to be inflated. See
  *       below for more details.
  *       <ul>
@@ -117,6 +131,11 @@ import java.util.Locale;
  *         <li>Type: {@link View}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code exo_repeat_toggle}</b> - The repeat toggle button.
+ *       <ul>
+ *         <li>Type: {@link View}</li>
+ *       </ul>
+ *   </li>
  *   <li><b>{@code exo_position}</b> - Text view displaying the current playback position.
  *       <ul>
  *         <li>Type: {@link TextView}</li>
@@ -189,6 +208,14 @@ public class PlaybackControlView extends FrameLayout {
      */
     boolean dispatchSeekTo(ExoPlayer player, int windowIndex, long positionMs);
 
+    /**
+     * Dispatches a {@link ExoPlayer#setRepeatMode(int)} operation.
+     *
+     * @param player The player to which the operation should be dispatched.
+     * @param repeatMode The repeat mode.
+     * @return True if the operation was dispatched. False if suppressed.
+     */
+    boolean dispatchSetRepeatMode(ExoPlayer player, @ExoPlayer.RepeatMode int repeatMode);
   }
 
   /**
@@ -209,11 +236,38 @@ public class PlaybackControlView extends FrameLayout {
       return true;
     }
 
+    @Override
+    public boolean dispatchSetRepeatMode(ExoPlayer player, @ExoPlayer.RepeatMode int repeatMode) {
+      player.setRepeatMode(repeatMode);
+      return true;
+    }
+
   };
 
+  /**
+   * Set of repeat toggle modes. Can be combined using bit-wise operations.
+   */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef(flag = true, value = {REPEAT_TOGGLE_MODE_NONE, REPEAT_TOGGLE_MODE_ONE,
+      REPEAT_TOGGLE_MODE_ALL})
+  public @interface RepeatToggleModes {}
+  /**
+   * All repeat mode buttons disabled.
+   */
+  public static final int REPEAT_TOGGLE_MODE_NONE = 0;
+  /**
+   * "Repeat One" button enabled.
+   */
+  public static final int REPEAT_TOGGLE_MODE_ONE = 1;
+  /**
+   * "Repeat All" button enabled.
+   */
+  public static final int REPEAT_TOGGLE_MODE_ALL = 2;
+
   public static final int DEFAULT_FAST_FORWARD_MS = 15000;
   public static final int DEFAULT_REWIND_MS = 5000;
   public static final int DEFAULT_SHOW_TIMEOUT_MS = 5000;
+  public static final @RepeatToggleModes int DEFAULT_REPEAT_TOGGLE_MODES = REPEAT_TOGGLE_MODE_NONE;
 
   /**
    * The maximum number of windows that can be shown in a multi-window time bar.
@@ -229,6 +283,7 @@ public class PlaybackControlView extends FrameLayout {
   private final View pauseButton;
   private final View fastForwardButton;
   private final View rewindButton;
+  private final ImageView repeatToggleButton;
   private final TextView durationView;
   private final TextView positionView;
   private final TimeBar timeBar;
@@ -237,6 +292,13 @@ public class PlaybackControlView extends FrameLayout {
   private final Timeline.Period period;
   private final Timeline.Window window;
 
+  private final Drawable repeatOffButtonDrawable;
+  private final Drawable repeatOneButtonDrawable;
+  private final Drawable repeatAllButtonDrawable;
+  private final String repeatOffButtonContentDescription;
+  private final String repeatOneButtonContentDescription;
+  private final String repeatAllButtonContentDescription;
+
   private ExoPlayer player;
   private ControlDispatcher controlDispatcher;
   private VisibilityListener visibilityListener;
@@ -248,6 +310,7 @@ public class PlaybackControlView extends FrameLayout {
   private int rewindMs;
   private int fastForwardMs;
   private int showTimeoutMs;
+  private @RepeatToggleModes int repeatToggleModes;
   private long hideAtMs;
   private long[] adBreakTimesMs;
 
@@ -280,6 +343,7 @@ public class PlaybackControlView extends FrameLayout {
     rewindMs = DEFAULT_REWIND_MS;
     fastForwardMs = DEFAULT_FAST_FORWARD_MS;
     showTimeoutMs = DEFAULT_SHOW_TIMEOUT_MS;
+    repeatToggleModes = DEFAULT_REPEAT_TOGGLE_MODES;
     if (attrs != null) {
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs,
           R.styleable.PlaybackControlView, 0, 0);
@@ -290,6 +354,7 @@ public class PlaybackControlView extends FrameLayout {
         showTimeoutMs = a.getInt(R.styleable.PlaybackControlView_show_timeout, showTimeoutMs);
         controllerLayoutId = a.getResourceId(R.styleable.PlaybackControlView_controller_layout_id,
             controllerLayoutId);
+        repeatToggleModes = getRepeatToggleModes(a, repeatToggleModes);
       } finally {
         a.recycle();
       }
@@ -335,6 +400,26 @@ public class PlaybackControlView extends FrameLayout {
     if (fastForwardButton != null) {
       fastForwardButton.setOnClickListener(componentListener);
     }
+    repeatToggleButton = (ImageView) findViewById(R.id.exo_repeat_toggle);
+    if (repeatToggleButton != null) {
+      repeatToggleButton.setOnClickListener(componentListener);
+    }
+    Resources resources = context.getResources();
+    repeatOffButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_off);
+    repeatOneButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_one);
+    repeatAllButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_all);
+    repeatOffButtonContentDescription = resources.getString(
+        R.string.exo_controls_repeat_off_description);
+    repeatOneButtonContentDescription = resources.getString(
+        R.string.exo_controls_repeat_one_description);
+    repeatAllButtonContentDescription = resources.getString(
+        R.string.exo_controls_repeat_all_description);
+  }
+
+  @SuppressWarnings("ResourceType")
+  private static @RepeatToggleModes int getRepeatToggleModes(TypedArray a,
+      @RepeatToggleModes int repeatToggleModes) {
+    return a.getInt(R.styleable.PlaybackControlView_repeat_toggle_modes, repeatToggleModes);
   }
 
   /**
@@ -440,6 +525,37 @@ public class PlaybackControlView extends FrameLayout {
     this.showTimeoutMs = showTimeoutMs;
   }
 
+  /**
+   * Returns which repeat toggle modes are enabled.
+   *
+   * @return The currently enabled {@link RepeatToggleModes}.
+   */
+  public @RepeatToggleModes int getRepeatToggleModes() {
+    return repeatToggleModes;
+  }
+
+  /**
+   * Sets which repeat toggle modes are enabled.
+   *
+   * @param repeatToggleModes A set of {@link RepeatToggleModes}.
+   */
+  public void setRepeatToggleModes(@RepeatToggleModes int repeatToggleModes) {
+    this.repeatToggleModes = repeatToggleModes;
+    if (player != null) {
+      @ExoPlayer.RepeatMode int currentMode = player.getRepeatMode();
+      if (repeatToggleModes == REPEAT_TOGGLE_MODE_NONE
+          && currentMode != ExoPlayer.REPEAT_MODE_OFF) {
+        controlDispatcher.dispatchSetRepeatMode(player, ExoPlayer.REPEAT_MODE_OFF);
+      } else if (repeatToggleModes == REPEAT_TOGGLE_MODE_ONE
+          && currentMode == ExoPlayer.REPEAT_MODE_ALL) {
+        controlDispatcher.dispatchSetRepeatMode(player, ExoPlayer.REPEAT_MODE_ONE);
+      } else if (repeatToggleModes == REPEAT_TOGGLE_MODE_ALL
+          && currentMode == ExoPlayer.REPEAT_MODE_ONE) {
+        controlDispatcher.dispatchSetRepeatMode(player, ExoPlayer.REPEAT_MODE_ALL);
+      }
+    }
+  }
+
   /**
    * Shows the playback controls. If {@link #getShowTimeoutMs()} is positive then the controls will
    * be automatically hidden after this duration of time has elapsed without user input.
@@ -494,6 +610,7 @@ public class PlaybackControlView extends FrameLayout {
   private void updateAll() {
     updatePlayPauseButton();
     updateNavigation();
+    updateRepeatModeButton();
     updateProgress();
   }
 
@@ -546,6 +663,31 @@ public class PlaybackControlView extends FrameLayout {
     }
   }
 
+  private void updateRepeatModeButton() {
+    if (!isVisible() || !isAttachedToWindow) {
+      return;
+    }
+    if (repeatToggleModes == REPEAT_TOGGLE_MODE_NONE) {
+      repeatToggleButton.setVisibility(View.GONE);
+      return;
+    }
+    switch (player.getRepeatMode()) {
+      case ExoPlayer.REPEAT_MODE_OFF:
+        repeatToggleButton.setImageDrawable(repeatOffButtonDrawable);
+        repeatToggleButton.setContentDescription(repeatOffButtonContentDescription);
+        break;
+      case ExoPlayer.REPEAT_MODE_ONE:
+        repeatToggleButton.setImageDrawable(repeatOneButtonDrawable);
+        repeatToggleButton.setContentDescription(repeatOneButtonContentDescription);
+        break;
+      case ExoPlayer.REPEAT_MODE_ALL:
+        repeatToggleButton.setImageDrawable(repeatAllButtonDrawable);
+        repeatToggleButton.setContentDescription(repeatAllButtonContentDescription);
+        break;
+    }
+    repeatToggleButton.setVisibility(View.VISIBLE);
+  }
+
   private void updateTimeBarMode() {
     if (player == null) {
       return;
@@ -705,6 +847,30 @@ public class PlaybackControlView extends FrameLayout {
     }
   }
 
+  private @ExoPlayer.RepeatMode int getNextRepeatMode() {
+    @ExoPlayer.RepeatMode int currentMode = player.getRepeatMode();
+    for (int offset = 1; offset <= 2; offset++) {
+      @ExoPlayer.RepeatMode int proposedMode = (currentMode + offset) % 3;
+      if (isRepeatModeEnabled(proposedMode)) {
+        return proposedMode;
+      }
+    }
+    return currentMode;
+  }
+
+  private boolean isRepeatModeEnabled(@ExoPlayer.RepeatMode int repeatMode) {
+    switch (repeatMode) {
+      case ExoPlayer.REPEAT_MODE_OFF:
+        return true;
+      case ExoPlayer.REPEAT_MODE_ONE:
+        return (repeatToggleModes & REPEAT_TOGGLE_MODE_ONE) != 0;
+      case ExoPlayer.REPEAT_MODE_ALL:
+        return (repeatToggleModes & REPEAT_TOGGLE_MODE_ALL) != 0;
+      default:
+        return false;
+    }
+  }
+
   private void rewind() {
     if (rewindMs <= 0) {
       return;
@@ -908,7 +1074,8 @@ public class PlaybackControlView extends FrameLayout {
 
     @Override
     public void onRepeatModeChanged(int repeatMode) {
-      // Do nothing.
+      updateRepeatModeButton();
+      updateNavigation();
     }
 
     @Override
@@ -959,6 +1126,8 @@ public class PlaybackControlView extends FrameLayout {
           controlDispatcher.dispatchSetPlayWhenReady(player, true);
         } else if (pauseButton == view) {
           controlDispatcher.dispatchSetPlayWhenReady(player, false);
+        } else if (repeatToggleButton == view) {
+          controlDispatcher.dispatchSetRepeatMode(player, getNextRepeatMode());
         }
       }
       hideAfterTimeout();
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
index 5219778109..5cbfb638a5 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
@@ -591,6 +591,16 @@ public final class SimpleExoPlayerView extends FrameLayout {
     controller.setFastForwardIncrementMs(fastForwardMs);
   }
 
+  /**
+   * Sets which repeat toggle modes are enabled.
+   *
+   * @param repeatToggleModes A set of {@link PlaybackControlView.RepeatToggleModes}.
+   */
+  public void setRepeatToggleModes(@PlaybackControlView.RepeatToggleModes int repeatToggleModes) {
+    Assertions.checkState(controller != null);
+    controller.setRepeatToggleModes(repeatToggleModes);
+  }
+
   /**
    * Sets whether the time bar should show all windows, as opposed to just the current one.
    *
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_all.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_all.xml
new file mode 100644
index 0000000000..dad37fa1f0
--- /dev/null
+++ b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_all.xml
@@ -0,0 +1,23 @@
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_off.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_off.xml
new file mode 100644
index 0000000000..132eae0d76
--- /dev/null
+++ b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_off.xml
@@ -0,0 +1,23 @@
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="32dp"
+        android:height="32dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#4EFFFFFF"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_one.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_one.xml
new file mode 100644
index 0000000000..d51010566a
--- /dev/null
+++ b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_one.xml
@@ -0,0 +1,23 @@
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="32dp"
+        android:width="32dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4zM13,15L13,9h-1l-2,1v1h1.5v4L13,15z"/>
+</vector>
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..2824e7847c490a8f3a79c10e95fc7b4425480f36
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtNuDl_Ar*{ouWaOP2oN}Y;r0)=
z#3uo}mj2+-IV$|bbY}gPDDO>W4p%xZWHDyBoap4(+kB#Yt++!rdrT0+<9_C61^mZm
zGxUfvN$9f}#Bn6-5js$z+`yHwmeX%hgNinbft_ay!!d0}sET{634h#I9-q$?lf}TH
v{D3jZr*VOzdeVtbiFAcyk{v%?*KU<od!r>S5PN+l&~*%+u6{1-oD!M<q!dNO

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b92f583da36162968e03ba73aeb70ca0fa6a224
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)IgaUj*T!Hj|RA3jh)(R-fRubeF
z%%J3}&1dTHaraK3NSUXLV@L(#(X)(f42mMI7w>Or+|pbped50J@B5bw4tnbyC=om#
zcylV3qw)u*3mkg{OeCvY7YLR#DK7Y5$}GWfm*E)WXY1>%tvf4Z9{f^h{`QA$-I)m-
zS`L#oI<k831u#y^W}2$NVbs{lrz;#Gkix{>lw)4SD0@UU*J=HIkn<TlUHx3vIVCg!
E06@)BIRF3v

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_one.png
new file mode 100644
index 0000000000000000000000000000000000000000..232aa2b1cdb4c4a9d3223954b22d8c413194d875
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)IgaUj*T!Hj|RA3jh)(R-fRubeF
z%#i=T-(dZXcGJ^9kupyg$B+ufqh}e}7!*ZZFW%qMxTU#H`ow+b-}f&W9Q4*ZP$GCf
z@a9x5N97Mr7dZ9^m`GN)E)XnfQe5!Alv#q|F2ga#&(_yjTX$B-Jou&1{Ou3hx-%0v
zv>YaFbY%753t*g-%`{bk!>F;9PggiXAccv$DaX8uQTB*zuG9MaAm=l9y85}Sb4q9e
E07KDJ@&Et;

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c91a47519092e1a22738c198ba5e9525fcaa82f
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjp`I>|Ar*{ouQ0MX1ah!mEV~mF
z^{Ga_MPVM}EY>^D8td#8av4My-d5Z*)hr-eVcOY3#us3;W6xx!m5dHd91i{33=?d&
mFrH#z6AE+iJn%>VI(zlSX$1zyy_N$lVDNPHb6Mw<&;$Smi7d<j

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..a94abd864f17788eeec1846713387a079ffa7622
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjxt=bLAr*{ouQ0M5aNu#dXzR!?
zD8jVh_=&&$pI2*eEII7()_~!2#HQ@$oC0|Z8VZ<;Sv0=1NuMy>&^EJwwS%-c!vhAr
z7X|Xy8>)84FrKStx^$T_k+~t@-Gj?Jn0k)4_BC!{ko_nhva8|S{x^3FN*XRc{JCW<
P&|(HpS3j3^P6<r_if})Y

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_one.png
new file mode 100644
index 0000000000000000000000000000000000000000..a59a98523948e2977e57ed672825c5f09a7db506
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj>7Fi*Ar*{ouWS@-FyLWvobHmY
z)hHChrK;z=hK12fBL2k#^G(NIab4uia9z++5njUl*~}ns+A(|fPZhEU+M0Que@t)q
z^RMv6e@+KUw=Ikuul_GExyPiiBAhWzeZqu`qG`et-k*NO@^JlW$q61;lz>(;c)I$z
JtaD0e0swHLIa>e#

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..97f7e1cc7590310a3b6aa322584e6e1ec8b6bab9
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UGd*1#Ln;{WTv;f}6v*Rpkwb+w
zhtq@0;Yi>yeZ|z8ovaEPt(W8kJ50|Mozp0DJ1;8O`JXFYTw)5h!^{Si2#=eblM+5;
zpJEMT^*J`(?nn*u5<4Z^@`icV4(DYPIA!1M*>&9_Z^y?saZc@*-%SkFxWu4gz`(`x
zz_{J%fAf`MN!B%L8x+-?%Q`Q(9LqDg*x>%8dP;bLGtkX;(TjdEt_l1NbR>hPtDnm{
Hr-UW|Cn-tw

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a0232170238bb285a24d6b34e43247005cc2169
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4Ut2|vCLn;`rTw!EmHWX=jI7MiM
z>*5B7298|;Cpfuw{xAH;w6MQ#D*Ii@4Kw&>dsu|;sA}~2$khCZMa5C&WLTTZiJoTN
zxCNRECe?q@d@k(qNPX5%ri5ow36H;ioqINh*`$pz`NBiT<(qvMe4ck8>cxN7g7oy~
zVkJ8w9OO51wmxCdV9!gM^qKX*8FttG>?*d`MIDM6+E%38lxR}eW4_+9!E?!Zjr9lG
bL>L%2bOKr?dByevUCrR>>gTe~DWM4fJ|9<5

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_one.png
new file mode 100644
index 0000000000000000000000000000000000000000..59bac337054e11eac123964a46de9c937d15b3b9
GIT binary patch
literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4U>pfi@Ln;`rUKJEzHWX-m=&;eQ
zP-~ul;@Wot%S+o6YPd>Q1>d>5(XZZnF3UULW!ihUi&V&`luasGQ_#o6+RyaB(LpH1
z$B)%BAfng3aan`c&6&Rg#2Y%jMZSh6tjlibeO{t>rj++WgX9^{cImn2zOh=ZXZ)f1
z<v-JoPe0D6zAU)K*yb&Ea3e#5e$Jwkzql5>e(=loKuWATqb^&I%hD4kH93`bRr)fV
gZaHed!TBjKXZ&Rgrb(UmfKF%dboFyt=akR{0P5IV-v9sr

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..2baaedecbff58a5b4141266f7ed74804fe1d034b
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_7U=bkQ(Ar*{oZx|LbI|{H~Y+HPR
zLBztCf!UyilQmh9X9{x?0~hbYxf&atdt>)6x%H3XnQHmLO}A|e=Ur|%?8Ut062n>(
z2W{R9K&DfJ;K6R&TcPeO{Qq}>q#CBO>g?bz__`xGzWMWhhO>W+V<xcZcrb~nFmg|7
zVD&uEq>|t$^nuUwz#f|iXZvrTvq{=LSAXBVvZQPO`YXDabgVfxm|&nkH=lo~U6B6#
zdFi`9vJGGD8*~;Xy6vdyDQlEmC~2;2lETRw>Et}^!UR<y)7R|0P5$n?=2NF`dG+__
Rd@qpCJzf1=);T3K0RVBtZ)E@g

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..2468f92f9f5f6a6ef76c0f4ddecdfccb8883785b
GIT binary patch
literal 322
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7`%AFmigjIEGX(zP;JVcGy9n<sn0c
zvWKXv0uzg^hRlMFLwo-}_DMW&(REqRk+)2o|M>eRm#EJ(%Qe`=D7jfWz+g9{$_)k;
z2}TtQ5QB-4d(sx^E*A&4pP$d=F>v}Fc*Sh6pMQhm`y2fe)-!n8w4K?_07r#!><I^6
zf3JR`u%7uq1q;U~DF*Rl$p@TIwKs68vJ~*~??`^scXhV*eEZS{lNnMA7?l{<?(Eph
z7$Ez&nfXFA<BW+u49~iG5A3N^^>(_)ngB)2D?Z)X{-ahQv$FPb-yZ%AR*Wh$7#I_s
zr<J|5YE0PmF`<;nqX33BFnM_VyYK&eu37HBl;D6X*Z2L<2ZfENtDnm{r-UW|Z8~})

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_one.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e1d53db7729a517f31385928fab67ae37e5b700
GIT binary patch
literal 331
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7`%AFba9PIEGX(zP%~PbJ#(m?P2kE
z9=5|(T$?MOtqk7yF5vuwInPSoS@;+F-G8#&yUhF7q3tH$|86_<`^2VHZ}zzO`EKS5
zGRl~j+~j@0!q&jT2SE-jx~E>4aSDbU2^Y3#5Z==u%2ZJ&pAdYrFn_{&hMD_$mGhZh
z?lE@k;TEVAUoiJM18-Gb{klshm>op(8Ko-OE@(c=Juvsm?FP?Zyazrr=goR_?A1xj
zxcUNyS<A#0Fk3k^uPYR1W~iC=N6|rC+hMa2>xMlR4NrfDZ{qo+=kO%9;lyr+iQgGt
z?fKHQpFd^V^V9qO@Eyov+QKPwfMYh-E>%^x6P)}43=KjC4Z;uvbmgZ1@0UMbxBflz
X#E2BlHybV;1_hF*tDnm{r-UW|-I#^I

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7207ebc0d296d8d33a9de048883837b982a7e7d
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeG3?%1&o4*=J@dWsUxB}__Fko@OdIgZrQWE4B
z%#i=TU(UMI1;}6N>Eakt!Fc!NLP2H)0hf!(GaQ2$mM&P)o~6NbxN!l?tA$-Rx_{^y
z)@-%*pSM=Pq{+{KV+%5M=I1&HSM8wE4VL2#Gi+HC1aq304Uj2k1^edj!GDD<nj9u@
zXf*^kpir|LLEM9?Cs-yP5I(W>_%u$XM)e8a6A;w&@ZStI$t(%W3R^9Kj%M(5^>bP0
Hl+XkK`_Wv{

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d6253ead693a726bdcd46b1421318d52bf8f325
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3p#Yx{S0Mc#71#x>wE~K=l?3?(
zGbs6L^O-t)+`SVha>moeF{Fa=?b(BzEe--M7qfgE)R<QbXPC90v|nnwYC+%sWeIbo
zW*xu2eS6NbgoOu85@#9s&QS9aUdDO3CG(KU!_6)F=D`~R9?WcNZCbKG!NW1&xC47M
zGm8j|CI?rO2n(wtSJN)WUscwoY<Hytk}qtxFlD(L9gzG$_ChnmEp|EfoZqer8W{pD
ziWve&{u#3IHW{!W@Q0^-Odu(dKN>SMBvf65t-N3SQ)9Z;lHp{cI7`5{L(N5a5$8o9
dSO4aA`^e8F3nN!ATnF?QgQu&X%Q~loCIHE)abExc

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_one.png
new file mode 100644
index 0000000000000000000000000000000000000000..d577f4ebcd6cf5eb5a30319b407bc9901e585e40
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3p#Yx{S0Mc#71#x>wE~K=l?3?(
zGvxp8H&}n8-Sjk2<cz0_V@L(#+p`BbTO0&jE@t^Ss4=e=&M<2~X}{EV)q=kN%M#{F
z%{qR4`}Uk=2@4OHB+fGMouTF<yo~d5OXeYyhnrjU&4V`tJeb+k+O%YWf`?<kaR>Hj
zW)=|^O%ARm5f)ZQuBKg#zpAWF+3rdQBwyHWVajqhIw1Lh?1g5ATkLY|Ilo;MG%^HQ
z6f*>l{4-?ZZ8Bg%;15svm_Sk@e>7%jNT|99TY10ur^a-xCBw-?ah8B@hnkD<BF>9I
duKvyK_K}}U7DldKxDMzq22WQ%mvv4FO#ooxa~J>s

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/layout/exo_playback_control_view.xml b/library/ui/src/main/res/layout/exo_playback_control_view.xml
index 1d6267e7f0..407329890d 100644
--- a/library/ui/src/main/res/layout/exo_playback_control_view.xml
+++ b/library/ui/src/main/res/layout/exo_playback_control_view.xml
@@ -34,6 +34,9 @@
     <ImageButton android:id="@id/exo_rew"
       style="@style/ExoMediaButton.Rewind"/>
 
+    <ImageButton android:id="@id/exo_repeat_toggle"
+      style="@style/ExoMediaButton"/>
+
     <ImageButton android:id="@id/exo_play"
       style="@style/ExoMediaButton.Play"/>
 
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index d8340c21cd..2cb28709b6 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -34,6 +34,11 @@
   <attr name="fastforward_increment" format="integer"/>
   <attr name="player_layout_id" format="reference"/>
   <attr name="controller_layout_id" format="reference"/>
+  <attr name="repeat_toggle_modes">
+    <flag name="none" value="0"/>
+    <flag name="one" value="1"/>
+    <flag name="all" value="2"/>
+  </attr>
 
   <declare-styleable name="SimpleExoPlayerView">
     <attr name="use_artwork" format="boolean"/>
@@ -57,6 +62,7 @@
     <attr name="show_timeout"/>
     <attr name="rewind_increment"/>
     <attr name="fastforward_increment"/>
+    <attr name="repeat_toggle_modes"/>
     <attr name="controller_layout_id"/>
   </declare-styleable>
 
diff --git a/library/ui/src/main/res/values/ids.xml b/library/ui/src/main/res/values/ids.xml
index 61db83825e..815487a54e 100644
--- a/library/ui/src/main/res/values/ids.xml
+++ b/library/ui/src/main/res/values/ids.xml
@@ -27,6 +27,7 @@
   <item name="exo_ffwd" type="id"/>
   <item name="exo_prev" type="id"/>
   <item name="exo_next" type="id"/>
+  <item name="exo_repeat_toggle" type="id"/>
   <item name="exo_duration" type="id"/>
   <item name="exo_position" type="id"/>
   <item name="exo_progress" type="id"/>