diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml
new file mode 100644
index 0000000000..28ac6a5786
--- /dev/null
+++ b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml
@@ -0,0 +1,26 @@
+<!-- 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="M10.59 9.17L5.41 4 4 5.41l5.17 5.17 1.42-1.41zM14.5 4l2.04 2.04L4 18.59 5.41 20
+17.96 7.46 20 9.5V4h-5.5zm.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04
+2.04-3.13-3.13z" />
+</vector>
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000..52a805aac1
Binary files /dev/null and b/library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle.png differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000..80ec43a119
Binary files /dev/null and b/library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle.png differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000..0924b2cb69
Binary files /dev/null and b/library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle.png differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000..ede80c9341
Binary files /dev/null and b/library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle.png differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000..4c5e141a3f
Binary files /dev/null and b/library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle.png differ
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 407329890d..159844c234 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_shuffle"
+      style="@style/ExoMediaButton.Shuffle"/>
+
     <ImageButton android:id="@id/exo_repeat_toggle"
       style="@style/ExoMediaButton"/>
 
diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml
index 103877f1e6..2510552c0c 100644
--- a/library/ui/src/main/res/values-af/strings.xml
+++ b/library/ui/src/main/res/values-af/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Herhaal alles"</string>
   <string name="exo_controls_repeat_off_description">"Herhaal niks"</string>
   <string name="exo_controls_repeat_one_description">"Herhaal een"</string>
+  <string name="exo_controls_shuffle_description">"Skommel"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-am/strings.xml b/library/ui/src/main/res/values-am/strings.xml
index 356566cb87..165b5eee62 100644
--- a/library/ui/src/main/res/values-am/strings.xml
+++ b/library/ui/src/main/res/values-am/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ሁሉንም ድገም"</string>
   <string name="exo_controls_repeat_off_description">"ምንም አትድገም"</string>
   <string name="exo_controls_repeat_one_description">"አንዱን ድገም"</string>
+  <string name="exo_controls_shuffle_description">"በው"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ar/strings.xml b/library/ui/src/main/res/values-ar/strings.xml
index 4bdbda061c..239f01be6b 100644
--- a/library/ui/src/main/res/values-ar/strings.xml
+++ b/library/ui/src/main/res/values-ar/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"تكرار الكل"</string>
   <string name="exo_controls_repeat_off_description">"عدم التكرار"</string>
   <string name="exo_controls_repeat_one_description">"تكرار مقطع واحد"</string>
+  <string name="exo_controls_shuffle_description">"ترتيب عشوائي"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-az-rAZ/strings.xml b/library/ui/src/main/res/values-az-rAZ/strings.xml
index 771335952f..1071cd5542 100644
--- a/library/ui/src/main/res/values-az-rAZ/strings.xml
+++ b/library/ui/src/main/res/values-az-rAZ/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Bütün təkrarlayın"</string>
   <string name="exo_controls_repeat_one_description">"Təkrar bir"</string>
   <string name="exo_controls_repeat_off_description">"Heç bir təkrar"</string>
+  <string name="exo_controls_shuffle_description">"Qarışdır"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-b+sr+Latn/strings.xml b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
index 7c373b5b55..a9d35e5cb6 100644
--- a/library/ui/src/main/res/values-b+sr+Latn/strings.xml
+++ b/library/ui/src/main/res/values-b+sr+Latn/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ponovi sve"</string>
   <string name="exo_controls_repeat_off_description">"Ne ponavljaj nijednu"</string>
   <string name="exo_controls_repeat_one_description">"Ponovi jednu"</string>
+  <string name="exo_controls_shuffle_description">"Pusti nasumično"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-be-rBY/strings.xml b/library/ui/src/main/res/values-be-rBY/strings.xml
index 7790a7887f..69b24ad5e9 100644
--- a/library/ui/src/main/res/values-be-rBY/strings.xml
+++ b/library/ui/src/main/res/values-be-rBY/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Паўтарыць усё"</string>
   <string name="exo_controls_repeat_off_description">"Паўтараць ні"</string>
   <string name="exo_controls_repeat_one_description">"Паўтарыць адзін"</string>
+  <string name="exo_controls_shuffle_description">"Перамяшаць"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-bg/strings.xml b/library/ui/src/main/res/values-bg/strings.xml
index ce9e3d6943..e350479788 100644
--- a/library/ui/src/main/res/values-bg/strings.xml
+++ b/library/ui/src/main/res/values-bg/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Повтаряне на всички"</string>
   <string name="exo_controls_repeat_off_description">"Без повтаряне"</string>
   <string name="exo_controls_repeat_one_description">"Повтаряне на един елемент"</string>
+  <string name="exo_controls_shuffle_description">"Разбъркване"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-bn-rBD/strings.xml b/library/ui/src/main/res/values-bn-rBD/strings.xml
index 5f8ebfa98e..446ef982a3 100644
--- a/library/ui/src/main/res/values-bn-rBD/strings.xml
+++ b/library/ui/src/main/res/values-bn-rBD/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"সবগুলির পুনরাবৃত্তি করুন"</string>
   <string name="exo_controls_repeat_off_description">"একটিরও পুনরাবৃত্তি করবেন না"</string>
   <string name="exo_controls_repeat_one_description">"একটির পুনরাবৃত্তি করুন"</string>
+  <string name="exo_controls_shuffle_description">"অদলবদল"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-bs-rBA/strings.xml b/library/ui/src/main/res/values-bs-rBA/strings.xml
index ef47099760..186b1058d9 100644
--- a/library/ui/src/main/res/values-bs-rBA/strings.xml
+++ b/library/ui/src/main/res/values-bs-rBA/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ponovite sve"</string>
   <string name="exo_controls_repeat_off_description">"Ne ponavljaju"</string>
   <string name="exo_controls_repeat_one_description">"Ponovite jedan"</string>
+  <string name="exo_controls_shuffle_description">"Izmiješaj"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ca/strings.xml b/library/ui/src/main/res/values-ca/strings.xml
index a42fe3b9cb..fd76a8e08e 100644
--- a/library/ui/src/main/res/values-ca/strings.xml
+++ b/library/ui/src/main/res/values-ca/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repeteix-ho tot"</string>
   <string name="exo_controls_repeat_off_description">"No en repeteixis cap"</string>
   <string name="exo_controls_repeat_one_description">"Repeteix-ne un"</string>
+  <string name="exo_controls_shuffle_description">"Reprodueix aleatòriament"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-cs/strings.xml b/library/ui/src/main/res/values-cs/strings.xml
index 9c1e50ce27..087ab79c25 100644
--- a/library/ui/src/main/res/values-cs/strings.xml
+++ b/library/ui/src/main/res/values-cs/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Opakovat vše"</string>
   <string name="exo_controls_repeat_off_description">"Neopakovat"</string>
   <string name="exo_controls_repeat_one_description">"Opakovat jednu položku"</string>
+  <string name="exo_controls_shuffle_description">"Náhodně"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-da/strings.xml b/library/ui/src/main/res/values-da/strings.xml
index 3ec132ebb7..0ae23ee288 100644
--- a/library/ui/src/main/res/values-da/strings.xml
+++ b/library/ui/src/main/res/values-da/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Gentag alle"</string>
   <string name="exo_controls_repeat_off_description">"Gentag ingen"</string>
   <string name="exo_controls_repeat_one_description">"Gentag en"</string>
+  <string name="exo_controls_shuffle_description">"Bland"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-de/strings.xml b/library/ui/src/main/res/values-de/strings.xml
index a1dc749864..37ca6c44ac 100644
--- a/library/ui/src/main/res/values-de/strings.xml
+++ b/library/ui/src/main/res/values-de/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Alle wiederholen"</string>
   <string name="exo_controls_repeat_off_description">"Keinen Titel wiederholen"</string>
   <string name="exo_controls_repeat_one_description">"Einen Titel wiederholen"</string>
+  <string name="exo_controls_shuffle_description">"Zufallsmix"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-el/strings.xml b/library/ui/src/main/res/values-el/strings.xml
index 845011fe55..534192e185 100644
--- a/library/ui/src/main/res/values-el/strings.xml
+++ b/library/ui/src/main/res/values-el/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Επανάληψη όλων"</string>
   <string name="exo_controls_repeat_off_description">"Καμία επανάληψη"</string>
   <string name="exo_controls_repeat_one_description">"Επανάληψη ενός στοιχείου"</string>
+  <string name="exo_controls_shuffle_description">"Τυχαία αναπαραγωγή"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-en-rAU/strings.xml b/library/ui/src/main/res/values-en-rAU/strings.xml
index 8a1742c8ca..0b4c465853 100644
--- a/library/ui/src/main/res/values-en-rAU/strings.xml
+++ b/library/ui/src/main/res/values-en-rAU/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repeat all"</string>
   <string name="exo_controls_repeat_off_description">"Repeat none"</string>
   <string name="exo_controls_repeat_one_description">"Repeat one"</string>
+  <string name="exo_controls_shuffle_description">"Shuffle"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-en-rGB/strings.xml b/library/ui/src/main/res/values-en-rGB/strings.xml
index 8a1742c8ca..0b4c465853 100644
--- a/library/ui/src/main/res/values-en-rGB/strings.xml
+++ b/library/ui/src/main/res/values-en-rGB/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repeat all"</string>
   <string name="exo_controls_repeat_off_description">"Repeat none"</string>
   <string name="exo_controls_repeat_one_description">"Repeat one"</string>
+  <string name="exo_controls_shuffle_description">"Shuffle"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-en-rIN/strings.xml b/library/ui/src/main/res/values-en-rIN/strings.xml
index 8a1742c8ca..0b4c465853 100644
--- a/library/ui/src/main/res/values-en-rIN/strings.xml
+++ b/library/ui/src/main/res/values-en-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repeat all"</string>
   <string name="exo_controls_repeat_off_description">"Repeat none"</string>
   <string name="exo_controls_repeat_one_description">"Repeat one"</string>
+  <string name="exo_controls_shuffle_description">"Shuffle"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-es-rUS/strings.xml b/library/ui/src/main/res/values-es-rUS/strings.xml
index f2ec848fb6..e6cf3fc6f2 100644
--- a/library/ui/src/main/res/values-es-rUS/strings.xml
+++ b/library/ui/src/main/res/values-es-rUS/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir todo"</string>
   <string name="exo_controls_repeat_off_description">"No repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir uno"</string>
+  <string name="exo_controls_shuffle_description">"Reproducir aleatoriamente"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-es/strings.xml b/library/ui/src/main/res/values-es/strings.xml
index 116f064223..04e1ea038c 100644
--- a/library/ui/src/main/res/values-es/strings.xml
+++ b/library/ui/src/main/res/values-es/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir todo"</string>
   <string name="exo_controls_repeat_off_description">"No repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir uno"</string>
+  <string name="exo_controls_shuffle_description">"Reproducción aleatoria"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-et-rEE/strings.xml b/library/ui/src/main/res/values-et-rEE/strings.xml
index 153611ece4..004ec7e6c3 100644
--- a/library/ui/src/main/res/values-et-rEE/strings.xml
+++ b/library/ui/src/main/res/values-et-rEE/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Korda kõike"</string>
   <string name="exo_controls_repeat_off_description">"Ära korda midagi"</string>
   <string name="exo_controls_repeat_one_description">"Korda ühte"</string>
+  <string name="exo_controls_shuffle_description">"Esita juhuslikus järjekorras"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-eu-rES/strings.xml b/library/ui/src/main/res/values-eu-rES/strings.xml
index 1128572d9a..6a3345303a 100644
--- a/library/ui/src/main/res/values-eu-rES/strings.xml
+++ b/library/ui/src/main/res/values-eu-rES/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Errepikatu guztiak"</string>
   <string name="exo_controls_repeat_off_description">"Ez errepikatu"</string>
   <string name="exo_controls_repeat_one_description">"Errepikatu bat"</string>
+  <string name="exo_controls_shuffle_description">"Erreproduzitu ausaz"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-fa/strings.xml b/library/ui/src/main/res/values-fa/strings.xml
index d6be77323b..101fcdbfb5 100644
--- a/library/ui/src/main/res/values-fa/strings.xml
+++ b/library/ui/src/main/res/values-fa/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"تکرار همه"</string>
   <string name="exo_controls_repeat_off_description">"تکرار هیچ‌کدام"</string>
   <string name="exo_controls_repeat_one_description">"یک‌بار تکرار"</string>
+  <string name="exo_controls_shuffle_description">"پخش درهم"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-fi/strings.xml b/library/ui/src/main/res/values-fi/strings.xml
index 10e4b0bbe3..92feb86683 100644
--- a/library/ui/src/main/res/values-fi/strings.xml
+++ b/library/ui/src/main/res/values-fi/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Toista kaikki"</string>
   <string name="exo_controls_repeat_off_description">"Toista ei mitään"</string>
   <string name="exo_controls_repeat_one_description">"Toista yksi"</string>
+  <string name="exo_controls_shuffle_description">"Toista satunnaisesti"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-fr-rCA/strings.xml b/library/ui/src/main/res/values-fr-rCA/strings.xml
index d8852b5d3f..45fc0a86f9 100644
--- a/library/ui/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui/src/main/res/values-fr-rCA/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Tout lire en boucle"</string>
   <string name="exo_controls_repeat_off_description">"Aucune répétition"</string>
   <string name="exo_controls_repeat_one_description">"Répéter un élément"</string>
+  <string name="exo_controls_shuffle_description">"Lecture aléatoire"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-fr/strings.xml b/library/ui/src/main/res/values-fr/strings.xml
index acf3670fa4..82b5a40626 100644
--- a/library/ui/src/main/res/values-fr/strings.xml
+++ b/library/ui/src/main/res/values-fr/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Tout lire en boucle"</string>
   <string name="exo_controls_repeat_off_description">"Ne rien lire en boucle"</string>
   <string name="exo_controls_repeat_one_description">"Lire en boucle un élément"</string>
+  <string name="exo_controls_shuffle_description">"Lire en mode aléatoire"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-gl-rES/strings.xml b/library/ui/src/main/res/values-gl-rES/strings.xml
index 81b854cafe..7062d8d023 100644
--- a/library/ui/src/main/res/values-gl-rES/strings.xml
+++ b/library/ui/src/main/res/values-gl-rES/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir todo"</string>
   <string name="exo_controls_repeat_off_description">"Non repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir un"</string>
+  <string name="exo_controls_shuffle_description">"Reprodución aleatoria"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-gu-rIN/strings.xml b/library/ui/src/main/res/values-gu-rIN/strings.xml
index 6d51c29f97..ed78b1ee30 100644
--- a/library/ui/src/main/res/values-gu-rIN/strings.xml
+++ b/library/ui/src/main/res/values-gu-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"બધા પુનરાવર્તન કરો"</string>
   <string name="exo_controls_repeat_off_description">"કંઈ પુનરાવર્તન કરો"</string>
   <string name="exo_controls_repeat_one_description">"એક પુનરાવર્તન કરો"</string>
+  <string name="exo_controls_shuffle_description">"શફલ કરો"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-hi/strings.xml b/library/ui/src/main/res/values-hi/strings.xml
index eadb0519df..ec624b1f35 100644
--- a/library/ui/src/main/res/values-hi/strings.xml
+++ b/library/ui/src/main/res/values-hi/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"सभी को दोहराएं"</string>
   <string name="exo_controls_repeat_off_description">"कुछ भी न दोहराएं"</string>
   <string name="exo_controls_repeat_one_description">"एक दोहराएं"</string>
+  <string name="exo_controls_shuffle_description">"शफ़ल करें"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-hr/strings.xml b/library/ui/src/main/res/values-hr/strings.xml
index cb49965640..7cb23e11dd 100644
--- a/library/ui/src/main/res/values-hr/strings.xml
+++ b/library/ui/src/main/res/values-hr/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ponovi sve"</string>
   <string name="exo_controls_repeat_off_description">"Bez ponavljanja"</string>
   <string name="exo_controls_repeat_one_description">"Ponovi jedno"</string>
+  <string name="exo_controls_shuffle_description">"Reproduciraj nasumično"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-hu/strings.xml b/library/ui/src/main/res/values-hu/strings.xml
index 43ac8f51ff..cf3d34c88f 100644
--- a/library/ui/src/main/res/values-hu/strings.xml
+++ b/library/ui/src/main/res/values-hu/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Összes ismétlése"</string>
   <string name="exo_controls_repeat_off_description">"Nincs ismétlés"</string>
   <string name="exo_controls_repeat_one_description">"Egy ismétlése"</string>
+  <string name="exo_controls_shuffle_description">"Véletlenszerű lejátszás"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-hy-rAM/strings.xml b/library/ui/src/main/res/values-hy-rAM/strings.xml
index 3b09f9a507..13a489baf5 100644
--- a/library/ui/src/main/res/values-hy-rAM/strings.xml
+++ b/library/ui/src/main/res/values-hy-rAM/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"կրկնել այն ամենը"</string>
   <string name="exo_controls_repeat_off_description">"Չկրկնել"</string>
   <string name="exo_controls_repeat_one_description">"Կրկնել մեկը"</string>
+  <string name="exo_controls_shuffle_description">"Խառնել"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-in/strings.xml b/library/ui/src/main/res/values-in/strings.xml
index 928be5945a..09b05815e6 100644
--- a/library/ui/src/main/res/values-in/strings.xml
+++ b/library/ui/src/main/res/values-in/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ulangi Semua"</string>
   <string name="exo_controls_repeat_off_description">"Jangan Ulangi"</string>
   <string name="exo_controls_repeat_one_description">"Ulangi Satu"</string>
+  <string name="exo_controls_shuffle_description">"Acak"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-is-rIS/strings.xml b/library/ui/src/main/res/values-is-rIS/strings.xml
index 75be2aeb17..12c4632cdf 100644
--- a/library/ui/src/main/res/values-is-rIS/strings.xml
+++ b/library/ui/src/main/res/values-is-rIS/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Endurtaka allt"</string>
   <string name="exo_controls_repeat_off_description">"Endurtaka ekkert"</string>
   <string name="exo_controls_repeat_one_description">"Endurtaka eitt"</string>
+  <string name="exo_controls_shuffle_description">"Stokka"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-it/strings.xml b/library/ui/src/main/res/values-it/strings.xml
index 59117a6b75..aea20db82e 100644
--- a/library/ui/src/main/res/values-it/strings.xml
+++ b/library/ui/src/main/res/values-it/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ripeti tutti"</string>
   <string name="exo_controls_repeat_off_description">"Non ripetere nessuno"</string>
   <string name="exo_controls_repeat_one_description">"Ripeti uno"</string>
+  <string name="exo_controls_shuffle_description">"Riproduci casualmente"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-iw/strings.xml b/library/ui/src/main/res/values-iw/strings.xml
index 347b137cf2..dd973af50b 100644
--- a/library/ui/src/main/res/values-iw/strings.xml
+++ b/library/ui/src/main/res/values-iw/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"חזור על הכל"</string>
   <string name="exo_controls_repeat_off_description">"אל תחזור על כלום"</string>
   <string name="exo_controls_repeat_one_description">"חזור על פריט אחד"</string>
+  <string name="exo_controls_shuffle_description">"ערבב"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml
index cf2cc49b67..d6ce751d5c 100644
--- a/library/ui/src/main/res/values-ja/strings.xml
+++ b/library/ui/src/main/res/values-ja/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"全曲を繰り返し"</string>
   <string name="exo_controls_repeat_off_description">"繰り返しなし"</string>
   <string name="exo_controls_repeat_one_description">"1曲を繰り返し"</string>
+  <string name="exo_controls_shuffle_description">"シャッフル"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ka-rGE/strings.xml b/library/ui/src/main/res/values-ka-rGE/strings.xml
index 75da8dde18..252e52f151 100644
--- a/library/ui/src/main/res/values-ka-rGE/strings.xml
+++ b/library/ui/src/main/res/values-ka-rGE/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"გამეორება ყველა"</string>
   <string name="exo_controls_repeat_off_description">"გაიმეორეთ არცერთი"</string>
   <string name="exo_controls_repeat_one_description">"გაიმეორეთ ერთი"</string>
+  <string name="exo_controls_shuffle_description">"არეულად დაკვრა"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-kk-rKZ/strings.xml b/library/ui/src/main/res/values-kk-rKZ/strings.xml
index b1ab22ecf6..43eb3dd030 100644
--- a/library/ui/src/main/res/values-kk-rKZ/strings.xml
+++ b/library/ui/src/main/res/values-kk-rKZ/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Барлығын қайталау"</string>
   <string name="exo_controls_repeat_off_description">"Ешқайсысын қайталамау"</string>
   <string name="exo_controls_repeat_one_description">"Біреуін қайталау"</string>
+  <string name="exo_controls_shuffle_description">"Кездейсоқ ретпен ойнату"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-km-rKH/strings.xml b/library/ui/src/main/res/values-km-rKH/strings.xml
index dfd9f7d863..653c9f051d 100644
--- a/library/ui/src/main/res/values-km-rKH/strings.xml
+++ b/library/ui/src/main/res/values-km-rKH/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ធ្វើ​ម្ដង​ទៀត​ទាំងអស់"</string>
   <string name="exo_controls_repeat_off_description">"មិន​ធ្វើ​ឡើង​វិញ"</string>
   <string name="exo_controls_repeat_one_description">"ធ្វើ​​ឡើងវិញ​ម្ដង"</string>
+  <string name="exo_controls_shuffle_description">"ច្របល់"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-kn-rIN/strings.xml b/library/ui/src/main/res/values-kn-rIN/strings.xml
index 868af17a65..7368fc8ad3 100644
--- a/library/ui/src/main/res/values-kn-rIN/strings.xml
+++ b/library/ui/src/main/res/values-kn-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ಎಲ್ಲವನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
   <string name="exo_controls_repeat_off_description">"ಯಾವುದನ್ನೂ ಪುನರಾವರ್ತಿಸಬೇಡಿ"</string>
   <string name="exo_controls_repeat_one_description">"ಒಂದನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
+  <string name="exo_controls_shuffle_description">"ಬೆರೆಸು"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ko/strings.xml b/library/ui/src/main/res/values-ko/strings.xml
index 89636ac8a0..99d4a2f9a4 100644
--- a/library/ui/src/main/res/values-ko/strings.xml
+++ b/library/ui/src/main/res/values-ko/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"전체 반복"</string>
   <string name="exo_controls_repeat_off_description">"반복 안함"</string>
   <string name="exo_controls_repeat_one_description">"한 항목 반복"</string>
+  <string name="exo_controls_shuffle_description">"셔플"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ky-rKG/strings.xml b/library/ui/src/main/res/values-ky-rKG/strings.xml
index 15fd50468a..9b903a124e 100644
--- a/library/ui/src/main/res/values-ky-rKG/strings.xml
+++ b/library/ui/src/main/res/values-ky-rKG/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Баарын кайталоо"</string>
   <string name="exo_controls_repeat_off_description">"Эч бирин кайталабоо"</string>
   <string name="exo_controls_repeat_one_description">"Бирөөнү кайталоо"</string>
+  <string name="exo_controls_shuffle_description">"Аралаштыруу"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-lo-rLA/strings.xml b/library/ui/src/main/res/values-lo-rLA/strings.xml
index 405d0c64fe..702cd54396 100644
--- a/library/ui/src/main/res/values-lo-rLA/strings.xml
+++ b/library/ui/src/main/res/values-lo-rLA/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ຫຼິ້ນ​ຊ້ຳ​ທັງ​ໝົດ"</string>
   <string name="exo_controls_repeat_off_description">"​ບໍ່ຫຼິ້ນ​ຊ້ຳ"</string>
   <string name="exo_controls_repeat_one_description">"ຫຼິ້ນ​ຊ້ຳ"</string>
+  <string name="exo_controls_shuffle_description">"ຫຼີ້ນແບບສຸ່ມ"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-lt/strings.xml b/library/ui/src/main/res/values-lt/strings.xml
index bd7d4142fc..d6073f42e3 100644
--- a/library/ui/src/main/res/values-lt/strings.xml
+++ b/library/ui/src/main/res/values-lt/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Kartoti viską"</string>
   <string name="exo_controls_repeat_off_description">"Nekartoti nieko"</string>
   <string name="exo_controls_repeat_one_description">"Kartoti vieną"</string>
+  <string name="exo_controls_shuffle_description">"Maišyti"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-lv/strings.xml b/library/ui/src/main/res/values-lv/strings.xml
index c2ebc70cbd..64393d679a 100644
--- a/library/ui/src/main/res/values-lv/strings.xml
+++ b/library/ui/src/main/res/values-lv/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Atkārtot visu"</string>
   <string name="exo_controls_repeat_off_description">"Neatkārtot nevienu"</string>
   <string name="exo_controls_repeat_one_description">"Atkārtot vienu"</string>
+  <string name="exo_controls_shuffle_description">"Atskaņot jauktā secībā"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-mk-rMK/strings.xml b/library/ui/src/main/res/values-mk-rMK/strings.xml
index 14ce7111a4..60858df8b1 100644
--- a/library/ui/src/main/res/values-mk-rMK/strings.xml
+++ b/library/ui/src/main/res/values-mk-rMK/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Повтори ги сите"</string>
   <string name="exo_controls_repeat_off_description">"Не повторувај ниту една"</string>
   <string name="exo_controls_repeat_one_description">"Повтори една"</string>
+  <string name="exo_controls_shuffle_description">"По случаен избор"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ml-rIN/strings.xml b/library/ui/src/main/res/values-ml-rIN/strings.xml
index 17fe7a1655..4e5eddb93e 100644
--- a/library/ui/src/main/res/values-ml-rIN/strings.xml
+++ b/library/ui/src/main/res/values-ml-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"എല്ലാം ആവർത്തിക്കുക"</string>
   <string name="exo_controls_repeat_off_description">"ഒന്നും ആവർത്തിക്കരുത്"</string>
   <string name="exo_controls_repeat_one_description">"ഒന്ന് ആവർത്തിക്കുക"</string>
+  <string name="exo_controls_shuffle_description">"ഷഫിൾ ചെയ്യുക"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-mn-rMN/strings.xml b/library/ui/src/main/res/values-mn-rMN/strings.xml
index bf9a7e03bf..4ab26a7f62 100644
--- a/library/ui/src/main/res/values-mn-rMN/strings.xml
+++ b/library/ui/src/main/res/values-mn-rMN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Бүгдийг давтах"</string>
   <string name="exo_controls_repeat_off_description">"Алийг нь ч давтахгүй"</string>
   <string name="exo_controls_repeat_one_description">"Нэгийг давтах"</string>
+  <string name="exo_controls_shuffle_description">"Холих"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-mr-rIN/strings.xml b/library/ui/src/main/res/values-mr-rIN/strings.xml
index df4ac9de6b..7869355b59 100644
--- a/library/ui/src/main/res/values-mr-rIN/strings.xml
+++ b/library/ui/src/main/res/values-mr-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"सर्व पुनरावृत्ती करा"</string>
   <string name="exo_controls_repeat_off_description">"काहीही पुनरावृत्ती करू नका"</string>
   <string name="exo_controls_repeat_one_description">"एक पुनरावृत्ती करा"</string>
+  <string name="exo_controls_shuffle_description">"शफल करा"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ms-rMY/strings.xml b/library/ui/src/main/res/values-ms-rMY/strings.xml
index 33dfcb40f0..fdde3de079 100644
--- a/library/ui/src/main/res/values-ms-rMY/strings.xml
+++ b/library/ui/src/main/res/values-ms-rMY/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ulang semua"</string>
   <string name="exo_controls_repeat_off_description">"Tiada ulangan"</string>
   <string name="exo_controls_repeat_one_description">"Ulangan"</string>
+  <string name="exo_controls_shuffle_description">"Rombak"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-my-rMM/strings.xml b/library/ui/src/main/res/values-my-rMM/strings.xml
index b4ea5b1155..3d7918d953 100644
--- a/library/ui/src/main/res/values-my-rMM/strings.xml
+++ b/library/ui/src/main/res/values-my-rMM/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"အားလုံး ထပ်တလဲလဲဖွင့်ရန်"</string>
   <string name="exo_controls_repeat_off_description">"ထပ်တလဲလဲမဖွင့်ရန်"</string>
   <string name="exo_controls_repeat_one_description">"တစ်ခုအား ထပ်တလဲလဲဖွင့်ရန်"</string>
+  <string name="exo_controls_shuffle_description">"မွှေနှောက်ဖွင့်ရန်"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-nb/strings.xml b/library/ui/src/main/res/values-nb/strings.xml
index 679bf1134c..370c759b84 100644
--- a/library/ui/src/main/res/values-nb/strings.xml
+++ b/library/ui/src/main/res/values-nb/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Gjenta alle"</string>
   <string name="exo_controls_repeat_off_description">"Ikke gjenta noen"</string>
   <string name="exo_controls_repeat_one_description">"Gjenta én"</string>
+  <string name="exo_controls_shuffle_description">"Spill av i tilfeldig rekkefølge"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ne-rNP/strings.xml b/library/ui/src/main/res/values-ne-rNP/strings.xml
index 43730c1880..19f43d0392 100644
--- a/library/ui/src/main/res/values-ne-rNP/strings.xml
+++ b/library/ui/src/main/res/values-ne-rNP/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"सबै दोहोर्याउनुहोस्"</string>
   <string name="exo_controls_repeat_off_description">"कुनै पनि नदोहोर्याउनुहोस्"</string>
   <string name="exo_controls_repeat_one_description">"एउटा दोहोर्याउनुहोस्"</string>
+  <string name="exo_controls_shuffle_description">"मिसाउनुहोस्"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-nl/strings.xml b/library/ui/src/main/res/values-nl/strings.xml
index 6383c977fc..a67ab2968c 100644
--- a/library/ui/src/main/res/values-nl/strings.xml
+++ b/library/ui/src/main/res/values-nl/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Alles herhalen"</string>
   <string name="exo_controls_repeat_off_description">"Niet herhalen"</string>
   <string name="exo_controls_repeat_one_description">"Eén herhalen"</string>
+  <string name="exo_controls_shuffle_description">"Shuffle"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pa-rIN/strings.xml b/library/ui/src/main/res/values-pa-rIN/strings.xml
index ddf60b0394..6250b90514 100644
--- a/library/ui/src/main/res/values-pa-rIN/strings.xml
+++ b/library/ui/src/main/res/values-pa-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ਸਭ ਨੂੰ ਦੁਹਰਾਓ"</string>
   <string name="exo_controls_repeat_off_description">"ਕੋਈ ਵੀ ਨਹੀਂ ਦੁਹਰਾਓ"</string>
   <string name="exo_controls_repeat_one_description">"ਇੱਕ ਦੁਹਰਾਓ"</string>
+  <string name="exo_controls_shuffle_description">"ਸ਼ੱਫਲ"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pl/strings.xml b/library/ui/src/main/res/values-pl/strings.xml
index 113c568f85..ff1d77fdd5 100644
--- a/library/ui/src/main/res/values-pl/strings.xml
+++ b/library/ui/src/main/res/values-pl/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Powtórz wszystkie"</string>
   <string name="exo_controls_repeat_off_description">"Nie powtarzaj"</string>
   <string name="exo_controls_repeat_one_description">"Powtórz jeden"</string>
+  <string name="exo_controls_shuffle_description">"Odtwarzaj losowo"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pt-rBR/strings.xml b/library/ui/src/main/res/values-pt-rBR/strings.xml
index 87c54358ba..86a91b0677 100644
--- a/library/ui/src/main/res/values-pt-rBR/strings.xml
+++ b/library/ui/src/main/res/values-pt-rBR/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir tudo"</string>
   <string name="exo_controls_repeat_off_description">"Não repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir um"</string>
+  <string name="exo_controls_shuffle_description">"Reproduzir aleatoriamente"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pt-rPT/strings.xml b/library/ui/src/main/res/values-pt-rPT/strings.xml
index ca34afec3c..5a7144e36b 100644
--- a/library/ui/src/main/res/values-pt-rPT/strings.xml
+++ b/library/ui/src/main/res/values-pt-rPT/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir tudo"</string>
   <string name="exo_controls_repeat_off_description">"Não repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir um"</string>
+  <string name="exo_controls_shuffle_description">"Reproduzir aleatoriamente"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pt/strings.xml b/library/ui/src/main/res/values-pt/strings.xml
index 2fc3191738..8441e4e1cc 100644
--- a/library/ui/src/main/res/values-pt/strings.xml
+++ b/library/ui/src/main/res/values-pt/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir tudo"</string>
   <string name="exo_controls_repeat_off_description">"Não repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir uma"</string>
+  <string name="exo_controls_shuffle_description">"Reproduzir aleatoriamente"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ro/strings.xml b/library/ui/src/main/res/values-ro/strings.xml
index 0b2ce540f7..6b8644e30a 100644
--- a/library/ui/src/main/res/values-ro/strings.xml
+++ b/library/ui/src/main/res/values-ro/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetați toate"</string>
   <string name="exo_controls_repeat_off_description">"Repetați niciuna"</string>
   <string name="exo_controls_repeat_one_description">"Repetați unul"</string>
+  <string name="exo_controls_shuffle_description">"Redați aleatoriu"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ru/strings.xml b/library/ui/src/main/res/values-ru/strings.xml
index 1d179e028c..51d11d6371 100644
--- a/library/ui/src/main/res/values-ru/strings.xml
+++ b/library/ui/src/main/res/values-ru/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Повторять все"</string>
   <string name="exo_controls_repeat_off_description">"Не повторять"</string>
   <string name="exo_controls_repeat_one_description">"Повторять один элемент"</string>
+  <string name="exo_controls_shuffle_description">"Перемешать"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-si-rLK/strings.xml b/library/ui/src/main/res/values-si-rLK/strings.xml
index bc37d98eed..eb8453b156 100644
--- a/library/ui/src/main/res/values-si-rLK/strings.xml
+++ b/library/ui/src/main/res/values-si-rLK/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"සියලු නැවත"</string>
   <string name="exo_controls_repeat_off_description">"කිසිවක් නැවත"</string>
   <string name="exo_controls_repeat_one_description">"නැවත නැවත එක්"</string>
+  <string name="exo_controls_shuffle_description">"කලවම් කරන්න"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sk/strings.xml b/library/ui/src/main/res/values-sk/strings.xml
index a6ea26bdf0..2428dbdcce 100644
--- a/library/ui/src/main/res/values-sk/strings.xml
+++ b/library/ui/src/main/res/values-sk/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Opakovať všetko"</string>
   <string name="exo_controls_repeat_off_description">"Neopakovať"</string>
   <string name="exo_controls_repeat_one_description">"Opakovať jednu položku"</string>
+  <string name="exo_controls_shuffle_description">"Náhodne prehrávať"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sl/strings.xml b/library/ui/src/main/res/values-sl/strings.xml
index 39813fa385..8ed731b0d3 100644
--- a/library/ui/src/main/res/values-sl/strings.xml
+++ b/library/ui/src/main/res/values-sl/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ponovi vse"</string>
   <string name="exo_controls_repeat_off_description">"Ne ponovi"</string>
   <string name="exo_controls_repeat_one_description">"Ponovi eno"</string>
+  <string name="exo_controls_shuffle_description">"Naključno predvajaj"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sq-rAL/strings.xml b/library/ui/src/main/res/values-sq-rAL/strings.xml
index 0bdc2e5f84..e2d209e10b 100644
--- a/library/ui/src/main/res/values-sq-rAL/strings.xml
+++ b/library/ui/src/main/res/values-sq-rAL/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Përsërit të gjithë"</string>
   <string name="exo_controls_repeat_off_description">"Përsëritni asnjë"</string>
   <string name="exo_controls_repeat_one_description">"Përsëritni një"</string>
+  <string name="exo_controls_shuffle_description">"Përziej"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sr/strings.xml b/library/ui/src/main/res/values-sr/strings.xml
index 0d54de5f6a..8e43a03079 100644
--- a/library/ui/src/main/res/values-sr/strings.xml
+++ b/library/ui/src/main/res/values-sr/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Понови све"</string>
   <string name="exo_controls_repeat_off_description">"Понављање је искључено"</string>
   <string name="exo_controls_repeat_one_description">"Понови једну"</string>
+  <string name="exo_controls_shuffle_description">"Пусти насумично"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sv/strings.xml b/library/ui/src/main/res/values-sv/strings.xml
index 0f7f16f91d..5ff1100632 100644
--- a/library/ui/src/main/res/values-sv/strings.xml
+++ b/library/ui/src/main/res/values-sv/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Upprepa alla"</string>
   <string name="exo_controls_repeat_off_description">"Upprepa inga"</string>
   <string name="exo_controls_repeat_one_description">"Upprepa en"</string>
+  <string name="exo_controls_shuffle_description">"Blanda"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml
index b48af88659..d1d5978f9c 100644
--- a/library/ui/src/main/res/values-sw/strings.xml
+++ b/library/ui/src/main/res/values-sw/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Rudia zote"</string>
   <string name="exo_controls_repeat_off_description">"Usirudie Yoyote"</string>
   <string name="exo_controls_repeat_one_description">"Rudia Moja"</string>
+  <string name="exo_controls_shuffle_description">"Changanya"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ta-rIN/strings.xml b/library/ui/src/main/res/values-ta-rIN/strings.xml
index 3dd64f52f7..43a925aa2e 100644
--- a/library/ui/src/main/res/values-ta-rIN/strings.xml
+++ b/library/ui/src/main/res/values-ta-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"அனைத்தையும் மீண்டும் இயக்கு"</string>
   <string name="exo_controls_repeat_off_description">"எதையும் மீண்டும் இயக்காதே"</string>
   <string name="exo_controls_repeat_one_description">"ஒன்றை மட்டும் மீண்டும் இயக்கு"</string>
+  <string name="exo_controls_shuffle_description">"குலை"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-te-rIN/strings.xml b/library/ui/src/main/res/values-te-rIN/strings.xml
index daf337a931..8541a44553 100644
--- a/library/ui/src/main/res/values-te-rIN/strings.xml
+++ b/library/ui/src/main/res/values-te-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"అన్నీ పునరావృతం చేయి"</string>
   <string name="exo_controls_repeat_off_description">"ఏదీ పునరావృతం చేయవద్దు"</string>
   <string name="exo_controls_repeat_one_description">"ఒకదాన్ని పునరావృతం చేయి"</string>
+  <string name="exo_controls_shuffle_description">"షఫుల్ చేయి"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-th/strings.xml b/library/ui/src/main/res/values-th/strings.xml
index ff89b8d5f5..cd97712b67 100644
--- a/library/ui/src/main/res/values-th/strings.xml
+++ b/library/ui/src/main/res/values-th/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"เล่นซ้ำทั้งหมด"</string>
   <string name="exo_controls_repeat_off_description">"ไม่เล่นซ้ำ"</string>
   <string name="exo_controls_repeat_one_description">"เล่นซ้ำรายการเดียว"</string>
+  <string name="exo_controls_shuffle_description">"สุ่มเพลง"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-tl/strings.xml b/library/ui/src/main/res/values-tl/strings.xml
index 89cf2ef400..e8cb87acdd 100644
--- a/library/ui/src/main/res/values-tl/strings.xml
+++ b/library/ui/src/main/res/values-tl/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ulitin Lahat"</string>
   <string name="exo_controls_repeat_off_description">"Walang Uulitin"</string>
   <string name="exo_controls_repeat_one_description">"Ulitin ang Isa"</string>
+  <string name="exo_controls_shuffle_description">"I-shuffle"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-tr/strings.xml b/library/ui/src/main/res/values-tr/strings.xml
index 87dba7204c..cd1bfc5444 100644
--- a/library/ui/src/main/res/values-tr/strings.xml
+++ b/library/ui/src/main/res/values-tr/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Tümünü Tekrarla"</string>
   <string name="exo_controls_repeat_off_description">"Hiçbirini Tekrarlama"</string>
   <string name="exo_controls_repeat_one_description">"Birini Tekrarla"</string>
+  <string name="exo_controls_shuffle_description">"Karıştır"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-uk/strings.xml b/library/ui/src/main/res/values-uk/strings.xml
index 1fdfe2bce5..1b0278ae94 100644
--- a/library/ui/src/main/res/values-uk/strings.xml
+++ b/library/ui/src/main/res/values-uk/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Повторити все"</string>
   <string name="exo_controls_repeat_off_description">"Не повторювати"</string>
   <string name="exo_controls_repeat_one_description">"Повторити один елемент"</string>
+  <string name="exo_controls_shuffle_description">"Перемішати"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ur-rPK/strings.xml b/library/ui/src/main/res/values-ur-rPK/strings.xml
index 956374b26a..f253e56c00 100644
--- a/library/ui/src/main/res/values-ur-rPK/strings.xml
+++ b/library/ui/src/main/res/values-ur-rPK/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"سبھی کو دہرائیں"</string>
   <string name="exo_controls_repeat_off_description">"کسی کو نہ دہرائیں"</string>
   <string name="exo_controls_repeat_one_description">"ایک کو دہرائیں"</string>
+  <string name="exo_controls_shuffle_description">"شفل کریں"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-uz-rUZ/strings.xml b/library/ui/src/main/res/values-uz-rUZ/strings.xml
index 286d4d01ab..a322690b2d 100644
--- a/library/ui/src/main/res/values-uz-rUZ/strings.xml
+++ b/library/ui/src/main/res/values-uz-rUZ/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Barchasini takrorlash"</string>
   <string name="exo_controls_repeat_off_description">"Takrorlamaslik"</string>
   <string name="exo_controls_repeat_one_description">"Bir marta takrorlash"</string>
+  <string name="exo_controls_shuffle_description">"Tasodifiy tartibda"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-vi/strings.xml b/library/ui/src/main/res/values-vi/strings.xml
index 4dea58d494..cff19eca7e 100644
--- a/library/ui/src/main/res/values-vi/strings.xml
+++ b/library/ui/src/main/res/values-vi/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Lặp lại tất cả"</string>
   <string name="exo_controls_repeat_off_description">"Không lặp lại"</string>
   <string name="exo_controls_repeat_one_description">"Lặp lại một mục"</string>
+  <string name="exo_controls_shuffle_description">"Trộn bài"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-zh-rCN/strings.xml b/library/ui/src/main/res/values-zh-rCN/strings.xml
index e15d84e777..cf3fe5e88b 100644
--- a/library/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui/src/main/res/values-zh-rCN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"重复播放全部"</string>
   <string name="exo_controls_repeat_off_description">"不重复播放"</string>
   <string name="exo_controls_repeat_one_description">"重复播放单个视频"</string>
+  <string name="exo_controls_shuffle_description">"随机播放"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-zh-rHK/strings.xml b/library/ui/src/main/res/values-zh-rHK/strings.xml
index ba793e98a8..78fe4ad995 100644
--- a/library/ui/src/main/res/values-zh-rHK/strings.xml
+++ b/library/ui/src/main/res/values-zh-rHK/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"重複播放所有媒體項目"</string>
   <string name="exo_controls_repeat_off_description">"不重複播放任何媒體項目"</string>
   <string name="exo_controls_repeat_one_description">"重複播放一個媒體項目"</string>
+  <string name="exo_controls_shuffle_description">"隨機播放"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-zh-rTW/strings.xml b/library/ui/src/main/res/values-zh-rTW/strings.xml
index bf3364d5cf..3632742904 100644
--- a/library/ui/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui/src/main/res/values-zh-rTW/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"重複播放所有媒體項目"</string>
   <string name="exo_controls_repeat_off_description">"不重複播放"</string>
   <string name="exo_controls_repeat_one_description">"重複播放單一媒體項目"</string>
+  <string name="exo_controls_shuffle_description">"隨機播放"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-zu/strings.xml b/library/ui/src/main/res/values-zu/strings.xml
index d7bebaaa2a..42dd59c97f 100644
--- a/library/ui/src/main/res/values-zu/strings.xml
+++ b/library/ui/src/main/res/values-zu/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Phinda konke"</string>
   <string name="exo_controls_repeat_off_description">"Ungaphindi lutho"</string>
   <string name="exo_controls_repeat_one_description">"Phida okukodwa"</string>
+  <string name="exo_controls_shuffle_description">"Shova"</string>
 </resources>
diff --git a/library/ui/src/main/res/values/ids.xml b/library/ui/src/main/res/values/ids.xml
index b16b1729da..b90d2329b3 100644
--- a/library/ui/src/main/res/values/ids.xml
+++ b/library/ui/src/main/res/values/ids.xml
@@ -28,6 +28,7 @@
   <item name="exo_ffwd" type="id"/>
   <item name="exo_prev" type="id"/>
   <item name="exo_next" type="id"/>
+  <item name="exo_shuffle" type="id"/>
   <item name="exo_repeat_toggle" type="id"/>
   <item name="exo_duration" type="id"/>
   <item name="exo_position" type="id"/>
diff --git a/library/ui/src/main/res/values/strings.xml b/library/ui/src/main/res/values/strings.xml
index c5d11eeadb..ee8cd78be7 100644
--- a/library/ui/src/main/res/values/strings.xml
+++ b/library/ui/src/main/res/values/strings.xml
@@ -24,4 +24,5 @@
   <string name="exo_controls_repeat_off_description">Repeat none</string>
   <string name="exo_controls_repeat_one_description">Repeat one</string>
   <string name="exo_controls_repeat_all_description">Repeat all</string>
+  <string name="exo_controls_shuffle_description">Shuffle</string>
 </resources>
diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
index a67cffe420..4ef8971ccd 100644
--- a/library/ui/src/main/res/values/styles.xml
+++ b/library/ui/src/main/res/values/styles.xml
@@ -51,4 +51,9 @@
     <item name="android:contentDescription">@string/exo_controls_pause_description</item>
   </style>
 
+  <style name="ExoMediaButton.Shuffle">
+    <item name="android:src">@drawable/exo_controls_shuffle</item>
+    <item name="android:contentDescription">@string/exo_controls_shuffle_description</item>
+  </style>
+
 </resources>