From b95c984d16ce39b635f5217981a5e2572c4bdfdb Mon Sep 17 00:00:00 2001
From: insun <insun@google.com>
Date: Thu, 13 Aug 2020 07:31:08 +0100
Subject: [PATCH] Cleanup unused ui resources and code

PiperOrigin-RevId: 326390725
---
 .../ui/StyledPlayerControlView.java           |   7 ----
 .../res/drawable-anydpi-v21/exo_ic_launch.xml |  25 --------------
 .../exo_ic_replay_circle_filled.xml           |  32 ------------------
 .../main/res/drawable-hdpi/exo_ic_launch.png  | Bin 248 -> 0 bytes
 .../exo_ic_replay_circle_filled.png           | Bin 633 -> 0 bytes
 .../main/res/drawable-ldpi/exo_ic_launch.png  | Bin 178 -> 0 bytes
 .../exo_ic_replay_circle_filled.png           | Bin 358 -> 0 bytes
 .../main/res/drawable-mdpi/exo_ic_launch.png  | Bin 171 -> 0 bytes
 .../exo_ic_replay_circle_filled.png           | Bin 452 -> 0 bytes
 .../main/res/drawable-xhdpi/exo_ic_launch.png | Bin 258 -> 0 bytes
 .../exo_ic_replay_circle_filled.png           | Bin 851 -> 0 bytes
 .../res/drawable-xxhdpi/exo_ic_launch.png     | Bin 306 -> 0 bytes
 .../exo_ic_replay_circle_filled.png           | Bin 1252 -> 0 bytes
 .../res/drawable-xxxhdpi/exo_ic_launch.png    | Bin 396 -> 0 bytes
 .../exo_ic_replay_circle_filled.png           | Bin 1812 -> 0 bytes
 library/ui/src/main/res/values/dimens.xml     |  13 -------
 library/ui/src/main/res/values/drawables.xml  |   1 -
 library/ui/src/main/res/values/styles.xml     |  13 -------
 18 files changed, 91 deletions(-)
 delete mode 100644 library/ui/src/main/res/drawable-anydpi-v21/exo_ic_launch.xml
 delete mode 100644 library/ui/src/main/res/drawable-anydpi-v24/exo_ic_replay_circle_filled.xml
 delete mode 100644 library/ui/src/main/res/drawable-hdpi/exo_ic_launch.png
 delete mode 100644 library/ui/src/main/res/drawable-hdpi/exo_ic_replay_circle_filled.png
 delete mode 100644 library/ui/src/main/res/drawable-ldpi/exo_ic_launch.png
 delete mode 100644 library/ui/src/main/res/drawable-ldpi/exo_ic_replay_circle_filled.png
 delete mode 100644 library/ui/src/main/res/drawable-mdpi/exo_ic_launch.png
 delete mode 100644 library/ui/src/main/res/drawable-mdpi/exo_ic_replay_circle_filled.png
 delete mode 100644 library/ui/src/main/res/drawable-xhdpi/exo_ic_launch.png
 delete mode 100644 library/ui/src/main/res/drawable-xhdpi/exo_ic_replay_circle_filled.png
 delete mode 100644 library/ui/src/main/res/drawable-xxhdpi/exo_ic_launch.png
 delete mode 100644 library/ui/src/main/res/drawable-xxhdpi/exo_ic_replay_circle_filled.png
 delete mode 100644 library/ui/src/main/res/drawable-xxxhdpi/exo_ic_launch.png
 delete mode 100644 library/ui/src/main/res/drawable-xxxhdpi/exo_ic_replay_circle_filled.png

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
index 1f076846b5..8b13a935ce 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
@@ -1667,13 +1667,6 @@ public class StyledPlayerControlView extends FrameLayout {
     return true;
   }
 
-  private boolean shouldShowPauseButton() {
-    return player != null
-        && player.getPlaybackState() != Player.STATE_ENDED
-        && player.getPlaybackState() != Player.STATE_IDLE
-        && player.getPlayWhenReady();
-  }
-
   @SuppressLint("InlinedApi")
   private static boolean isHandledMediaKey(int keyCode) {
     return keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_launch.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_launch.xml
deleted file mode 100644
index 1646f2a0e4..0000000000
--- a/library/ui/src/main/res/drawable-anydpi-v21/exo_ic_launch.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2020 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="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
-</vector>
diff --git a/library/ui/src/main/res/drawable-anydpi-v24/exo_ic_replay_circle_filled.xml b/library/ui/src/main/res/drawable-anydpi-v24/exo_ic_replay_circle_filled.xml
deleted file mode 100644
index e57acb5db6..0000000000
--- a/library/ui/src/main/res/drawable-anydpi-v24/exo_ic_replay_circle_filled.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2020 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="40dp"
-    android:height="40dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:pathData="M0,0h24v24H0V0z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="evenOdd"
-        android:pathData="M12,2C6.48,2,2,6.48,2,12c0,5.52,4.48,10,10,10c5.52,0,10-4.48,10-10
-C22,6.48,17.52,2,12,2z
-M18,12c0,3.31-2.69,6-6,6c-3.31,0-6-2.69-6-6h2c0,2.21,1.79,4,4,4s4-1.79,4-4s-1.79-4-4-4v3L8,7l4-4v3
-C15.31,6,18,8.69,18,12z" />
-</vector>
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-hdpi/exo_ic_launch.png
deleted file mode 100644
index 43f6b63a2c5d406a382eca51ca7f831fbfed04d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB_ItWGhEy=Vy}psR*+7IXaYhTT
zk+W1=QK}((>LzyPgM8C32~E|1^uFejc5dw<y$@5eOqjwJFl<fF%g%njr`j++W&78?
zSI_A`_HN=@`*@-9?S|L!0jAtm-)1+?4U>3c7|!>^(0apD2RUPAQ<hH>yZ5tu`pBsm
zR!%tb!$zZf;{uCg4K`{O?KWy0pJphWNdB~d)xuV-Iz|7%ml<!C#({)+1H_)xeflf2
vrK_6lY4l%b!|Uq5ricYMluGqF{bjhQH*I$IE8EpTuP}JJ`njxgN@xNA7^z{X

diff --git a/library/ui/src/main/res/drawable-hdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-hdpi/exo_ic_replay_circle_filled.png
deleted file mode 100644
index cf275837ae8086bb0d578c44d6a8e6f743de5545..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 633
zcmV-<0*3vGP)<h;3K|Lk000e1NJLTq002Ay002A)1ONa4ko6Jy0006&Nkl<ZcmeI$
zFHEXo6vy#1w>PN~8hC><YH##Lz|BO@&Ln-4$Oe_7fj}0j276IAUuUzh5j0@n<$KGs
zJLdD}z&)4ky7B4TZ|}4BIp;h_{u5hURA|!SmRH^Zc;}T{Iy9-sW>BTY6Dd!$sLH>@
zF#`&|d&5^S;8=7zO7vOad*c^j3;LAAh6Ymz$BGa)r6GTdj2^^eMM&$B$@<u3l#Ufa
zGh%oB*oQ={gYIFiXfow%9ds~S<G|@Eu@0;0uKp)$u?~A2QsaU<3Q`)Pqm;TpF_gJt
zM$8obUehP6rWaL)#PlVN6BfyXR?wm#WWkA~FaR(`pGBev62}2^SUs9gUbyCz?Aup|
z%sG%4E>T48aZX*9FeKzsVt6D$sa$P##G%Rz-(!5bP$;#!Eq~A^q#_|SQK;RizI3nW
z_?i+z2Zh>?b24$b$Jdb%#;{&=syK3vZ!96?=(L&ZMjUGRatUFA-Lp6x;hRVZU)X(!
z!#=*R)r0rN;bU{b6MRSF@VvRB&Qr~h8`2Cv*BIZqI+xh56CHf_;*gP(VkjU@d~?d;
zP$$JuGAnqL(r;@LN?V*!6^ETzw4p5~27#e0p-zrt9|W|~rzK0sIOUobKJBBAHtZFg
ziNZAOCC1x=mdJ+2TV<e!Aywl*uRmcTW?WI;%o9d0js<sIP~(t2%cD(yrrLE44|9VN
znPC;7(pM4o<%>>VzUb>FiyoP6!KTp{Z1$C+PG2e7m#7$)s2f-t|IkIb-PYD`u{ze7
T^ZU@l00000NkvXXu0mjfM^Y*r

diff --git a/library/ui/src/main/res/drawable-ldpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-ldpi/exo_ic_launch.png
deleted file mode 100644
index cc7e1deb89bedd2259f04c679be8ee2dbb710d53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheN>3NZkP61Lmm66R7znsMWSYA)
zICXK^lpcY(8q6%~Eml~?aXoqNGN)!z!R=j)d<&S~Mqga6vRAuV>w@}1$0ex&GLsn8
zCqA5@xY4YgrE{-y*PefCET$;VV-Y$s|Jex}mNy6HD*w;la=yORT;`JC$5#$t7k*uJ
dV59DA_UHT7MD>Vme-3m6gQu&X%Q~loCIGiAMXvw=

diff --git a/library/ui/src/main/res/drawable-ldpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-ldpi/exo_ic_replay_circle_filled.png
deleted file mode 100644
index a5ac2da5de96154f7af86fdbba3899212ed83018..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 358
zcmV-s0h#`ZP)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV250003kNkl<Zcmd3m
zEr<e96h;?@f$h_=BN_#J*rIF}JJYpCllJ_&_HENU7^i~{IB3{39OdHUGS92eX`c3e
z4)^_jU!MjEBjzkwGG|2czBs^90q_q(g<}vGGaL=v)gP1wNA^nXQ-Z3uo;D@@=W5+n
zLm8+|oh+y-ux3jgRL>q|hw|GRNy#~)xKJI^p#1S2jQ7~%X&Bmd1Dy*6le>N}Ym-oc
zrGv1NSvj7HMCCDnrQ?~(-cNYOD$l^y@f0#|hi9hpf*5C+x52Zp<c+k?U1VMMPTB=Z
zblG}fC(>Jcih_M$_EqK5vqG`2O2Oed(374C1(*0E37_X)^yu@nYr~P8H2yKdFR9dQ
zS;xO*7zQ>P2Jsj&DOHUGprQfTC3@);z1NXf=+hqn0LpY>LdOQ7T>t<807*qoM6N<$
Eg3X$rSO5S3

diff --git a/library/ui/src/main/res/drawable-mdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-mdpi/exo_ic_launch.png
deleted file mode 100644
index dbf0ba2c9729ef4ac55526cd37898711ea9150e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjMV>B>Ar*{or*0H%P!Ksf<G{JO
zB{u2F%n~YQHzqxfOLnZ9RBf_fXCq_Y0^@}|GYq&*T67E|VrrR8`FHF&#yD|)q{EYM
zaZGytOnTxf6Hco>`1GLLWgc6@;io^F+@C}~h*o;1^Wcxhg%g<<4+>fpOg+n`uP-&B
UuxnT1E1>NRp00i_>zopr0C;gfH~;_u

diff --git a/library/ui/src/main/res/drawable-mdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-mdpi/exo_ic_replay_circle_filled.png
deleted file mode 100644
index e73489a571786595b4a0844e380255d211d278dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq001Ze001Zm1ONa4CiigW0004tNkl<ZcmeI!
z0fvHM5XSL$VcAqC2q@JN7C@;31gHzt0ZKs8F;+tKDRh!Tcjy8IMD<_B(tO{1wX<PC
zKftT^QJQyVLc$C0H0d&C#*8stn!G<7^+t<`BS}XhTD<)=uEqv!MBIj&KP*E;+$aRB
zh>Rz$z}CjuK(VFpd)(f{3DWH!M)HyR?F9F1`M4jrNR1O@DbZociKInHN1eE@kb)v>
zlIrPow;}GpXGq0>Guj4Qm$Wc+Bs2O{RAgMs1}-slBmh_D<bz<1wzO~dfMO#7#14t1
z$Vq=H@y2O@W+S<o2f+%h5j1-6IFg$SRk_nf>jjMo2_{k-%AGRWBxp<lzp32GnX|ir
zId%4A-~_EKXG0ACPwt_$<*dpD!~3T+&{jb($MBSmE$kCTInA>}^B1;xdg~y_Gv|u%
zKfUzkFbF@W&}Zgt4)@#FSt8x-%hO<CP0`<AJtF{4Ea^}p>mLDjNcq_z<rt%u9i#q1
uZ`ncbTtyrrGS4qd*k$Se*SRMb&X;dZyWYj^rU*m;0000<MNUMnLSTZB2+p+t

diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-xhdpi/exo_ic_launch.png
deleted file mode 100644
index 2a9dae6c563c6baa5a1b7975f7625ce21d499894..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtlb$Y)Ar*{oXKv&@?7(xRXU#;O
zN3J#rT-C<Az0?X0e$kR=SK{yB?$Ej7ar*xy6JO>%4a_?vQZx-ttoSqilnW#KfisNH
z?=Z3^-Zy(7##Hmuqd}+sICIKRUAcr)?$3e^o<42ZvqxmYba5u0N<{^IeHM;Sks2JI
zoEj8BOecqkxQHajIF5iPtw41G38%6d56qfg&MbGpTK7H6l#V5P!~&GAsWu2CTws*F
zz<8)I{OOr_*K5DsX+Hd%*@jtPZ7%l>_9w2hmSxtZgmxD*b>?dWJ;mVZ>gTe~DWM4f
DJCtCJ

diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-xhdpi/exo_ic_replay_circle_filled.png
deleted file mode 100644
index e700831f6ed602c4b06e6d81c8a70648a9ed9f41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 851
zcmV-Z1FZasP)<h;3K|Lk000e1NJLTq002+`002-31ONa4Bp5m-0009TNkl<ZcmeI&
zfk&%R7{~FaD+Rfznoy(wY8WBHf`kf9|HMEs6l%a2fB{he3<~UD$iRRCP_r6r0n%*i
zdtI1&x;yWC_CB2k?+3ua&v|#w&U4Nqu~;nj7Za?oO_~D^NVClf6QZX_iX3-5&;?9g
z9=Ib%O2&gUH@xBEjT_SPbC@B=GoyMY$IMTJyQGC(o**qQy@n)1ogjG;!qmx#4<x8S
zSUeG2R7iaPl6ZBACxV;TZ(TN=(sPR^f~y{<@;xX*XuJVNQ4~F{oZ<~InyVj~Jw-s>
zEOO!+PZ1DKqOV-%rJ)MgBOPtudvT3tVv!AwC{U%3o0katqT99{j3v%!;G!a<A)|<A
zV2Uhl!evG~64VJ&=eLZ2Im(2oGb66JAk4ibq7_-X1iNsbzZQ6ixX(L5T8?u_4j^ho
zc1e=3M(h$K=T`naLG*|KK#e@BLqBwoCnj9BXCQh+2Ix>?LB60&khFy18Z;3xHQ5pa
z^R%$LmSFs%4Vs9U;Dh54K69I2VRbH`i3md?8nehW4eV0-6&x6mVVdS|k@LtanOo3B
zWVn+2gJt^I+)5B0K^KwXI_9QB6`Mz~W0DT&B03fZ1#CJ@iVbUM-D6X8J}s?@4V(D$
z$*c^pj@_o%u!B!Y;{ay2BQ_l3)1GmRwL6R!a7qT)8&|*`?B-;E<hVZZCU)yGz$~BR
zStM(&MGZA9d~P$r8+E}Lna9HCMjiZDS2f11(!s*tUtREFq0h20vV?`-!$J<bb7SNJ
zO)PvKw^G<Om^Q|4@qvZvz^XX%XT`v=J)+{suPB;Y%!`37nwa!Old9}2%NHzAqJv3a
zb}9<@to(;n^3)j67w($Esms3g$}`EX{^~=2dGu~Z^mciqxPI%B74d%krntZaC^P5%
z0@IER;o4-G@_YqsM+FxR&RFtwiLQ8tF!ZTX;D`+t_0JIMha3-jr1ei>KAre|Ow=m+
ze~#6-^8cW%QS{ytpwQ#gdsBtND{1d-DGC)5o*R1<>SV^*8im)^DF4l6aeJQM2FEe9
dh{j^E*dMcJm_gkM-;4kN002ovPDHLkV1h~Nia`JX

diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-xxhdpi/exo_ic_launch.png
deleted file mode 100644
index ded2c2b859741f519db5698f3571c2a13ce92287..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawetNn%hEy=Vy}6P1kb?kgpn8m8
zfRb8yq{lnP$qZMLxPG*#?crpzym2zT>ZDu!idCyt?eaRU>TUNj?}z5yuSI^9>}pMy
zK6!m(k(ylF_^z6HZ8dWv^M|dQ`5(#1AF;ISD6SEBbjGfua2CJQoWuafIm*oz?rep9
zJdb1~k60RY6sHJ0KcR4LqT`&yj}^{sbeyxe$-<qru#fAJjOY=|SGS9yEHSV_KNOC9
zbe!_IS?$<I$MzV;<E*(V2MQgfISWEAxXog4XZ^?(q7c`}wdGm-+MJq?(Kl?Kma8$(
xyRY2qGpFpl%v`}4+n-G{T+1C48X8*5D06paf<x+}<G?^*@O1TaS?83{1ON>8dyN19

diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-xxhdpi/exo_ic_replay_circle_filled.png
deleted file mode 100644
index 8a8f11a31dd956382eaef935fc36bbe2dae19318..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq004LZ004Lh1ONa4lWqQ4000E5Nkl<ZcmeF2
z0YqI<7{~ACEsSVAo2jCP1q_C_84nDw01|KX0Biw3U|7~ej|a9w06=d*@L-800F6cP
zP+qE1;-y=>-w422opb;1bZ*=q0Ehd#_qgA8zVAEHeI_F#BO@atBO`++6ev^SC%^bh
zlNJCin*8M#KdDfrz?1tgIzWjfn%L50i4p_%QS~KX*&-=heC6eRQO)y-4M1muPvp}r
zJ4lUly2&{;2Gc3~f<<C%`GP$$i@ZpeY%f)=z+N|saN~+9y=l>%U>DqUorM8*nFudC
zOamNsuOS%?hC}Lp;MiSP5{6?wgpqy3JRNskSr|IZ^XRU1pRo=Jb+18Voo9EcJIc1C
zs|&+6qj#nIik7OY3j-})MgHL(r-E)bh2fNU{=e>tpxbR>IPv<G85K6OA7N-Q>Pz>j
z@T>AC4BI^Q5_g3_<X0HhJ;Y_^1zq35FyH+oQpl>z@SG6}Oi`gh8;wp^6HbN`<;)Jy
zLy;Q$B<Hw`#|j#Pt^?#4XN{yZx_92ybseC{D#@6Lbm(<I-s|v@J>1zvuZmCwUDzG^
zsN+smFU?(ope(^OF>YLn<vtbx0xG}f3^x{|<S@hq1Xg~{0WMrH6eWck0O6I-aG{pG
zY0?H?%0P=vmYJczgIhOtj6H4g$%H>6;c$4^p~B!Tzb_X)CllU4#^HDv^W&y3LmhiI
zB6k==#k~M<#N-Wec@KNW+=XWm5K24?<RT-KuxHj?cnb-kh_}My$Ox<0vgJOk&_P5f
z)2^7mGDU3ZFyJO!LPsgYFGNOI!<Lep@De&&tHt>HVjNqR+=QFxXw9@E^2QRuK6W%+
zbo<fK+oj*dbhqDL_$@kmLp)|k`f<Ir7cPTuWo(!;miyY+QMMPJ1K-Nnu){;4q&R0U
zTnFFE*ikS%-8by0+YA3DEzB66ZVEeo+Y4`!7M2Z9_XayQg(w`1KZd6p>3SsQkhE}U
zs>HahwSWuK!i6y~C0?rv_Xuml2@6{~FRV?~mTqFlh+*xY^!~K;u=K{Tb~(LaNl!ec
z3~Oi7n|SD{<u}9H0s^5@%emw|cOJ5XMu5XZ89Una2(K&L@lYrL6pcN{7=aK4fPSr0
z$9DvLmU#3?yid-U8XTeEzlbN4X~&K0ClLryrY&L1T4aO;6#N(Bg;q<^JY>cS)&yv^
z2+g$B$Ow-ul>;=>3@{7o_94dtt^{kBj$zLpebIklk|PZGZiovb4{F{@o*%@R2tV>5
z47E((a<jO?4h8}bwFqNNG4G=r;Q<9^SZ0$Jgdbbd2h+}Y9SH;*OcO>A4+Q0qqldz9
z>6v+Br+&Cp7$1(A4nICDKoxiD^o1V~*RKG$u*b)+R{#W<AQ`I^LtgR_pg~gB7$+D0
z8jpTa%Y}Vv6zK_YQA@vyC(x!rg((V*@cdspcT58S0K+hhzckQ;(92)KBlatvpDlN?
z^E)lb@3elH_U&QXFY&&;#C!C>x6uQ}THriu;o*{*hf6$7Gx9Wz$A^3#9~!(A&GS+o
z5Zie`%oA}tPsDiyaOV*~&pfg`^N1nOor651TElqbmIJjT)2phgs_FqY<OR5Uc6r?Z
O0000<MNUMnLSTZStv?O`

diff --git a/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_launch.png b/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_launch.png
deleted file mode 100644
index 476022a9806d8effbcc268295ae5b340a900d871..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z!>c5;uuoF`1Uqq8gn3n>qUOf
zT~pW;Ui)m>)LX`=y4z!$pbul)b=DrX;zHv++Z*1?wKe{Czg`*(MBo1xov{4=C+(@&
z^R;(&{ixNO$-Ind(|OYhwFi@OBqlgN%Vj=yavS6Jwam+UnIAA}PfM1wYk2;fVcvV@
zihcYKeyTM*w~t{sZ@-FRo_!nFgP%qX&rdVV(+5iO;N#TrJb3QhFrS~X&W`2BPXRFJ
zJVTuw(}$X`?rooH8BTp?)VR;Sphms{opbg(<9(g`?0cSaeUd#ei2;caJuvA5>!;KM
zNvt9P4vb(TI4)Coch#Hs$MoudTTgub{ok`ali3CS*&So>5BTyo#hk5@B_;1%df72!
noqd|$=gh194GNU&rFZ4;pX{ml^vX8{7|INuu6{1-oD!M<S@f``

diff --git a/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_replay_circle_filled.png b/library/ui/src/main/res/drawable-xxxhdpi/exo_ic_replay_circle_filled.png
deleted file mode 100644
index 9be0765ae265df39c2bf4b97da8d29a21a11f89d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1812
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
C1X_3i

diff --git a/library/ui/src/main/res/values/dimens.xml b/library/ui/src/main/res/values/dimens.xml
index cc1620aac1..25e367caa3 100644
--- a/library/ui/src/main/res/values/dimens.xml
+++ b/library/ui/src/main/res/values/dimens.xml
@@ -38,17 +38,4 @@
 
     <dimen name="exo_time_view_padding">10dp</dimen>
     <dimen name="exo_time_view_width">170sp</dimen>
-
-    <!-- Rounded corner radius for video subtitles. -->
-    <dimen name="exo_subtitle_corner_radius">2dp</dimen>
-
-    <!-- Shadow radius for video subtitles. -->
-    <dimen name="exo_subtitle_shadow_radius">2dp</dimen>
-
-    <!-- Shadow offset for video subtitles. -->
-    <dimen name="exo_subtitle_shadow_offset">2dp</dimen>
-
-    <!-- Outline width for video subtitles. -->
-    <dimen name="exo_subtitle_outline_width">2dp</dimen>
-
 </resources>
diff --git a/library/ui/src/main/res/values/drawables.xml b/library/ui/src/main/res/values/drawables.xml
index ed1f85865c..f72c57f8a9 100644
--- a/library/ui/src/main/res/values/drawables.xml
+++ b/library/ui/src/main/res/values/drawables.xml
@@ -39,7 +39,6 @@
 
   <drawable name="exo_styled_controls_play">@drawable/exo_ic_play_circle_filled</drawable>
   <drawable name="exo_styled_controls_pause">@drawable/exo_ic_pause_circle_filled</drawable>
-  <drawable name="exo_styled_controls_replay">@drawable/exo_ic_replay_circle_filled</drawable>
   <drawable name="exo_styled_controls_next">@drawable/exo_ic_skip_next</drawable>
   <drawable name="exo_styled_controls_previous">@drawable/exo_ic_skip_previous</drawable>
   <drawable name="exo_styled_controls_fastforward">@drawable/exo_ic_forward</drawable>
diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
index 64e3b9cd42..3f0081cf05 100644
--- a/library/ui/src/main/res/values/styles.xml
+++ b/library/ui/src/main/res/values/styles.xml
@@ -105,19 +105,6 @@
     <item name="android:textColor">@color/exo_white</item>
   </style>
 
-  <style name="ExoStyledControls.Button.Minimal" />
-
-  <!-- TODO(insun): Merge play and pause buttons in minimal mode as well. -->
-  <style name="ExoStyledControls.Button.Minimal.Pause">
-    <item name="android:src">@drawable/exo_styled_controls_pause</item>
-    <item name="android:contentDescription">@string/exo_controls_pause_description</item>
-  </style>
-
-  <style name="ExoStyledControls.Button.Minimal.Play">
-    <item name="android:src">@drawable/exo_styled_controls_play</item>
-    <item name="android:contentDescription">@string/exo_controls_play_description</item>
-  </style>
-
   <style name="ExoStyledControls.TimeText">
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>