From 710d61e379516c461aea29820efdd334aaae32a1 Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Tue, 14 Sep 2021 14:25:06 +0200
Subject: [PATCH] Moved drawable around

---
 .idea/misc.xml                                |   3 +++
 .../ui/notification/PlayingNotification.java  |   5 ++---
 .../res/drawable-anydpi/ic_notification.xml   |  15 +++++++++++++
 .../res/drawable-hdpi/ic_notification.png     | Bin 0 -> 678 bytes
 .../res/drawable-mdpi/ic_notification.png     | Bin 0 -> 453 bytes
 app/src/main/res/drawable-v24/ic_shuffle.xml  |  15 -------------
 .../res/drawable-xhdpi/ic_notification.png    | Bin 0 -> 888 bytes
 .../res/drawable-xxhdpi/ic_notification.png   | Bin 0 -> 1387 bytes
 .../res/{drawable-v24 => drawable}/ic_add.xml |   0
 .../ic_download.xml                           |   0
 .../ic_launcher_foreground.xml                |   0
 app/src/main/res/drawable/ic_notification.png | Bin 2911 -> 0 bytes
 .../ic_play_for_work.xml                      |   0
 app/src/main/res/drawable/ic_shuffle.xml      |  20 ++++++++++++------
 .../ic_toolbar_motion_on.xml                  |   0
 app/src/main/res/values/strings.xml           |   4 ++--
 16 files changed, 35 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/res/drawable-anydpi/ic_notification.xml
 create mode 100644 app/src/main/res/drawable-hdpi/ic_notification.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_notification.png
 delete mode 100644 app/src/main/res/drawable-v24/ic_shuffle.xml
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_notification.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_notification.png
 rename app/src/main/res/{drawable-v24 => drawable}/ic_add.xml (100%)
 rename app/src/main/res/{drawable-v24 => drawable}/ic_download.xml (100%)
 rename app/src/main/res/{drawable-v24 => drawable}/ic_launcher_foreground.xml (100%)
 delete mode 100644 app/src/main/res/drawable/ic_notification.png
 rename app/src/main/res/{drawable-v24 => drawable}/ic_play_for_work.xml (100%)
 rename app/src/main/res/{drawable-v24 => drawable}/ic_toolbar_motion_on.xml (100%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 62b367ff..7ad3498b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="../../.gradle/caches/transforms-3/cfd4e4d299e24db95f3608b5f72af22b/transformed/jetified-exoplayer-ui-2.12.2/res/drawable-anydpi-v21/exo_ic_play_circle_filled.xml" value="0.28055555555555556" />
+        <entry key="app/src/main/res/drawable-anydpi/ic_api_notification.xml" value="0.44351851851851853" />
         <entry key="app/src/main/res/drawable-v24/ic_add.xml" value="0.27685185185185185" />
         <entry key="app/src/main/res/drawable-v24/ic_cast.xml" value="0.28055555555555556" />
         <entry key="app/src/main/res/drawable-v24/ic_download.xml" value="0.27685185185185185" />
@@ -31,6 +32,7 @@
         <entry key="app/src/main/res/drawable/ic_pause.xml" value="0.28055555555555556" />
         <entry key="app/src/main/res/drawable/ic_play.xml" value="0.27685185185185185" />
         <entry key="app/src/main/res/drawable/ic_play_arrow_white_24dp.xml" value="0.28055555555555556" />
+        <entry key="app/src/main/res/drawable/ic_play_for_work.xml" value="0.30625" />
         <entry key="app/src/main/res/drawable/ic_refresh.xml" value="0.18958333333333333" />
         <entry key="app/src/main/res/drawable/ic_search.xml" value="0.27685185185185185" />
         <entry key="app/src/main/res/drawable/ic_settings.xml" value="0.28055555555555556" />
@@ -39,6 +41,7 @@
         <entry key="app/src/main/res/drawable/ic_skip_next_white_24dp.xml" value="0.28055555555555556" />
         <entry key="app/src/main/res/drawable/ic_skip_previous_white_24dp.xml" value="0.28055555555555556" />
         <entry key="app/src/main/res/drawable/ic_star.xml" value="0.2722222222222222" />
+        <entry key="app/src/main/res/drawable/ic_toolbar_motion_on.xml" value="0.30625" />
         <entry key="app/src/main/res/drawable/ui_empty_list.xml" value="0.28055555555555556" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/bottom_sheet_album_dialog.xml" value="0.3229166666666667" />
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java b/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
index 29197c25..51007758 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
@@ -108,8 +108,7 @@ public class PlayingNotification {
                                 .addAction(playPauseAction)
                                 .addAction(nextAction);
 
-                        builder.setStyle(new MediaStyle().setMediaSession(service.getMediaSession().getSessionToken()).setShowActionsInCompactView(0, 1, 2))
-                                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
+                        builder.setStyle(new MediaStyle().setMediaSession(service.getMediaSession().getSessionToken()).setShowActionsInCompactView(0, 1, 2)).setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
 
                         // notification has been stopped before loading was finished
                         if (stopped) return;
@@ -159,7 +158,7 @@ public class PlayingNotification {
     private void createNotificationChannel() {
         NotificationChannel notificationChannel = notificationManager.getNotificationChannel(NOTIFICATION_CHANNEL_ID);
         if (notificationChannel == null) {
-            notificationChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, service.getString(R.string.playing_notification_name), NotificationManager.IMPORTANCE_LOW);
+            notificationChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, service.getString(R.string.playing_notification_name), NotificationManager.IMPORTANCE_DEFAULT);
             notificationChannel.setDescription(service.getString(R.string.playing_notification_description));
             notificationChannel.enableLights(false);
             notificationChannel.enableVibration(false);
diff --git a/app/src/main/res/drawable-anydpi/ic_notification.xml b/app/src/main/res/drawable-anydpi/ic_notification.xml
new file mode 100644
index 00000000..d8e6440c
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_notification.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="1.104"
+      android:scaleY="1.104"
+      android:translateX="-1.248"
+      android:translateY="-1.248">
+    <path
+        android:fillColor="@color/titleTextColor"
+        android:pathData="M4,9L4,9c0.26,0.26 0.34,0.63 0.25,0.98c-0.35,1.36 -0.36,2.87 0.1,4.38c0.88,2.91 3.44,5.1 6.44,5.55c5.52,0.81 10.19,-4.06 9.03,-9.62c-0.65,-3.13 -3.23,-5.61 -6.37,-6.16c-1.21,-0.21 -2.38,-0.15 -3.46,0.13C9.64,4.35 9.26,4.26 9.01,4.01l0,0C8.45,3.45 8.73,2.52 9.48,2.32c1.47,-0.38 3.06,-0.44 4.7,-0.09c3.98,0.86 7.09,4.18 7.7,8.2c1.04,6.81 -4.82,12.58 -11.64,11.42C6.23,21.16 2.98,17.99 2.2,14c-0.31,-1.59 -0.24,-3.12 0.12,-4.53C2.52,8.72 3.45,8.45 4,9zM6,12c0,-3.31 2.69,-6 6,-6s6,2.69 6,6s-2.69,6 -6,6S6,15.31 6,12zM7,5.5C7,6.33 6.33,7 5.5,7S4,6.33 4,5.5S4.67,4 5.5,4S7,4.67 7,5.5z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..26fee622aa014f87ba1f4fda56b8c52680facdd4
GIT binary patch
literal 678
zcmV;X0$KfuP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0007QNkl<ZcwXI?
zfl=c?3`Hq{5?lfuoI8LHjt)o%aR<-=DIp!i9dI2u9Y6=4{kLmJ`?Ya4Hr&kdW_HN<
zOR}t$*5>BsrvTtCtlwd6W%1gb+J772W=&WFF7qDNYgnzu_)@|RHu-(4IACpJh?Q`q
zPuD-p&HjYdr^VlMY&BjL$gA)c)~)Ebn0aDqVZ9(ve8k0@1+fCki`vx^d^`BW>XSm8
z9%Zj~*MRttx}68LJ4?a&p<r_#)-z(ma-xRxo7e6O_S|NTTUYty%pTZ7l0obbmi!X5
zX~nmclpCCCg7cFEtKmsvaQkde)o+~z%g&#X&4pOLN{E?n`M02Po7U2rc-%T$rQPXn
zC!-;WY*0OSYI^1p+14QT=*YX(DC($BB@DkGL|el&An;XhMvda5RVE>7_DR-~jk#!#
zR_Kh-PeRmsqpd|_+asW}!dyb^sjp&?*!E#NE6gQir(rEeiCvY@+sVZ_t)-XPmeW}U
znIz*w?O!!@YXu$qNyPV!y~fQ?>u}*{M12xF4NK`I=FVtGtCbA0(;EH|TS9B%@zr6c
z*MEl4!5ENEbbTRSgT7ol(f!MnAfG5cK_mK-q%;}r*S*y<3dZi+7qOBxJ;jG>#g|((
z<YxZsA_IQRT~f)8Q$kzb_?Q-d^V&2`#-7ROSA*}J67UsZpz=OfKwtREoZl)1<!@j1
z)E0$morAW?M`7&hIDer-a#WZY|Fig|J|l?#k-R2bWshr<vB39~!tFeyRZ76pY5YYX
z_5d4pDXdDPaaV(w*bez?<{Y$Pbr%oARq#fLpT3=08^m*}QTzXvPhLTpL3qyV+yDRo
M07*qoM6N<$g2B;JPyhe`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..6220f9e133ec1c10f8967f26518668b5db9663ac
GIT binary patch
literal 453
zcmV;$0XqJPP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004uNkl<ZcwWVo
zjd8*-422n?BV+_NXf|j@V1sr8yg}K3j=%=Z2JHs00o~wL4@t3Xk`fBnes?--S$~!t
zvsnB$0G1-}B1dF6rtVp!seP_O0;CXlidT_`+V>3PYPasdUucp}q&4AqBXU4yFS4v-
z7KlL~9A4`6F=!|9Wj<`(bP`#78^TMaLEk|8y*4R&58b&Z`M^}WxB#uF4RiK)ilO%?
zlcX4T6gonyxx`R0v^Xd40-C+J3D85F%O?08Oqb6P`EZlX+4E~@%-0L+V*>A8YxB6(
zxtuD7USo2M2^>$5f^IIUN`OC2;4SKGeoKown;&9=-jt`?fcqTsE++7b`KkMzzV(`}
zVgi0tP71oupr3*^UQ{w2TV6gF$Q2I{7L9^_46ene!v8Z;5!?(I%(qv(iqJD*8(ATR
z<0h=f;KPp2Fhg$7S=Tl-(1aeGzD;dY08PRw96E1Bo<tr^IOf~6Hyc8qrj9oXF84md
vs=15tw)_O0p#AQPka|`-krjRu_?~<NM*1m8yG~g}00000NkvXXu0mjfB_PJl

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-v24/ic_shuffle.xml b/app/src/main/res/drawable-v24/ic_shuffle.xml
deleted file mode 100644
index 73de35fb..00000000
--- a/app/src/main/res/drawable-v24/ic_shuffle.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M8.94,7.88L5.59,4.53c-0.29,-0.29 -0.77,-0.29 -1.06,0l0,0c-0.29,0.29 -0.29,0.77 0,1.06l3.35,3.35L8.94,7.88z"/>
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M12.12,11.06l-1.06,1.06l2.41,2.41l-0.62,0.62C12.54,15.46 12.76,16 13.21,16h2.29c0.28,0 0.5,-0.22 0.5,-0.5v-2.29c0,-0.45 -0.54,-0.67 -0.85,-0.35l-0.62,0.62L12.12,11.06z"/>
-  <path
-      android:fillColor="@color/titleTextColor"
-      android:pathData="M12.85,4.85l0.62,0.62l-8.94,8.94c-0.29,0.29 -0.29,0.77 0,1.06l0,0c0.29,0.29 0.77,0.29 1.06,0l8.94,-8.94l0.62,0.62C15.46,7.46 16,7.24 16,6.79V4.5C16,4.22 15.78,4 15.5,4h-2.29C12.76,4 12.54,4.54 12.85,4.85z"/>
-</vector>
diff --git a/app/src/main/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4a31fdeeeea1314f9035db9cd585e94af0c4a48
GIT binary patch
literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009&Nkl<ZcwX(9
z3vuH>5JUqZ5Cp*tVg_dh7K1Ybi$To5VsK$#F-RE13}Oa-+Zib(wPy9V<GaeM+NxOU
zosV{Q^vT1+5B~`OwqZPnaYCF^7)O})QEhx1A(+=%kYnJyt=hXOA%L|;HGy}0S0cf2
zBEigoE3#4_vj_%%!)kkvNZp3xX&C1)E@2d5WaZ%TP3`wfsp(^{J|=;7ZGVK3sBSF5
z#wv^)-N_tv-Y9~Bomwn;QSDTMtw-3(#F(B$n0!!cB_FDt3v3^~siTr<Ng#e@3e|eR
zuI^Jg+`Xf~%E}{EZ7;9@yc*r8mcaDf@P9;Khv&BFNC@#H)~f9VwzO5}DBuJS3w#gT
z;6tHyk4Pf$lXz9#Y+&6)JJlGXeINdwNL4o(Sny-6dJNiVCBb7V#8M3e%LQK%OCnPt
z`c?tfH4;5u0jv2rWfOxo8+(Gk(QYKCy5@^gTn{W&4S|1EmLhZfc^f)W9fhfg-W?5-
zT(Wc&+SXNAs|Zdvr0^i3v!mIG<{G4qUoE49YA7m1)OzOOG0|KD&#%T-sD>gX8=$!g
zj^C_L;{}(=dDj1}(0wo|fyPFGznQMZT6}L*P(NRZlzU2`)jaCwE0L1P`MWP6ZB?10
zxe1P6ZSfb?P*jMha5Q(_MspFhp8U|hTVI3J@vG#ji3QhqLWKWtwIsBy_2241aFVQo
zQ*uX_sc1nm$DdXPNmTa<+HXPL!xa-%-4f8I`bty;XODaVzl<_Rx5BceL|ct=E&X^`
zKUG}=*e60Iadb;15euI7m9y$vz`5%o@<jmVWKKD8t`|JZ)O+hoRqFyjDEA8)%vpwU
zt3fU2G-|#A{<oz!)kT57e8f$Hz!FK(eY4{^YTUpH>_0djt(EEo@pgGcM*tPnz#afO
zhU&d5Pj;#w1pF>Qq93HDKwG6vk6iVmpaHd5;~4|4ZVXtTKQ>J^$aT&nXh<#B;LYxc
z5g%WJ_E$Nli(Kc;0)Bf{n9K?G;g;hG_QjfibG3MG2-9l556tiTeYp39#euEHS)9*-
zwo>(Tb?6lBmyI!e-WSyF&4Kms4eZsA30>+@mhc$Qu^}+=MD6_WFY*`Br7jB*av1mk
O0000<MNUMnLSTZogP+R)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..a60d9a0870e36c24dc2cd4f4f1e7cf80e5bd52db
GIT binary patch
literal 1387
zcmV-x1(f=UP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000FtNkl<ZcwX(B
zjd9yJ5QS61m7o&bLD<2$1G9sq1G9sq1FM6$1F?g+gL4N-2k-d20s}vD7o^NTXY|cr
zJQm*qizToCDDl&$D_5@kO#t}Zl`ma+=*kIYPB86#S3YZfe+}mj{_4AZIjrMHSMIv<
zkGAt6={i!s>f*dGSe3T<q3Al$YOfaHgpV31tP`NbsVfKdVb^pHf0s@y4fE6&^<x#f
zh7Yg=d4K*}OqA4g<>~Bv&TrW0Vqp-QtQ^muQ*$XNtT~!sK~YBEtxi|LI)94^j#CRu
z^bFc_-|{%<-;LHeJFt#Ld{vvJfCZSNYb?tK33dld(23%7n-iE{993hfwT@X}#oCg?
zt=g^uZ0Zi>xFP2E5#{NXXw-I1*uFY6!2Ht<<3~`Xwrc~+Po<UbKg^j9SQ*NV^7`mT
zsl}h|!pSMTc83Y|l1_hvvcD&_dly}WU$q6HR+}MU9sVh{W1!8Q*5`q7L2A_QUBH5*
zjq?9mwF>4v&EISNL!cZa)^$+3cLAFkx3Gj*@qg9iz?{5f#FSv2#bgWfG2*B;tAX*!
z{XNv$u7dLFR;kV6z@7rG#e=r5Al@g<o3Kk@-QXm`Ai<`3L~**#0?Mo1lGN%?4&r0U
zQT4Nf@?Ba3cO)P_Q;t7N!uBdB*h=wjtl?R|H9ys_obLLg8f4U}e*=ayeldw**lsJ_
zM=yw%{Z{pFfWMimRGWb9jXb+8_@zGPz~4NEcBSYxs!w2@{mxWs^)rDuS-UxmhS3UC
zsXl>y<Q~OM3y5#1J3UL09Zb~xT!lO05}%K%?}7iE_qS>ji0{VM+^W9`_<5*RZ4dlJ
z+p0E!eXU+fqy8q~4+cL`t1{zJwF&qQ?SWSPP4JqE6RPb|VMe3c1cHWkK&$>H5R81)
z_NXwUQEdX(0KL$tHi2t^UT9RCz%@WGw5m<;nu>QstNtbs99mV|gA4Ws2=2rVXw=^X
z{2S};`645CZ-9@xQS@k4+k^P1aZo)$ylvka@2GK5Va8GQJ&31Et@;Gw2jW}Ns-FqO
zqrOpn58_9r-&LPL+~8K!>SqG+OsQ1=3iyfI%|isf-4;Bne>w2aoPL5%AXxqoC%tHT
zu8sRl2llP7hkNGiK|Ec;3b2n{^rU{}Ab$O!R{a|gXLxc@n*`z<wiY+)SAy46EDWxC
zZ$O;HeyBbN@d#X+TK&m^y|&<SRJ{wzk*?Gx2XTOx;;4S)ApSyvRB96fe^*VyFXsr>
z4boBDS71N8^JrCH1m%dk`=SKanQpbVtDyWUM5Q*PKs<_wyX+@m({+i}jdi*SIe~at
zC*jH*0$b6d4InpMMJEYtpA^+KmS+U}oE+HA@iv8o{v6b95{SP{B%^~wVAHNNGKZi|
zt@U}J92_z#&_z)0(4-&{y#B2t>mMq-M$NeW$r<``_9^1>sinX=Q<@%hsF;(MhCZBq
ziFn4upcjGNl~Rz%H?>_0wyn+#z&=bG?V~|?=}+*-43*k11=~Wr&&gRPI0;PK+nn&;
zRU!a3s-xqBQfnQHfN?L3<ggQ?Un3~d)%7ppQ@OI-wDMqsxa{>v=7~E@7+KVwZ63~b
zOo2YG8=M4eb$b$rrohggU?c2a3P0nusR7A(#N4aZC1Cg^mo1?$^K1g=0yYhJ$F_z(
z9Mr$v09$ffae58dW~Kh@7FZHLN+;%qQ;BU<+Wv<DmdKf-IP~YpQ>=q^)!0J<o*UT6
tN&(}vh=Rsz)NqtE*lM}Ha^=cW{0~uGf0YvXd>#M*002ovPDHLkV1kPay9WRO

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-v24/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_add.xml
rename to app/src/main/res/drawable/ic_add.xml
diff --git a/app/src/main/res/drawable-v24/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_download.xml
rename to app/src/main/res/drawable/ic_download.xml
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ic_notification.png b/app/src/main/res/drawable/ic_notification.png
deleted file mode 100644
index a401d50f33cf635410a2871597e3623765335245..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2911
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

diff --git a/app/src/main/res/drawable-v24/ic_play_for_work.xml b/app/src/main/res/drawable/ic_play_for_work.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_play_for_work.xml
rename to app/src/main/res/drawable/ic_play_for_work.xml
diff --git a/app/src/main/res/drawable/ic_shuffle.xml b/app/src/main/res/drawable/ic_shuffle.xml
index 1843fc75..73de35fb 100644
--- a/app/src/main/res/drawable/ic_shuffle.xml
+++ b/app/src/main/res/drawable/ic_shuffle.xml
@@ -1,9 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/titleTextColor"
-        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.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/titleTextColor"
+      android:pathData="M8.94,7.88L5.59,4.53c-0.29,-0.29 -0.77,-0.29 -1.06,0l0,0c-0.29,0.29 -0.29,0.77 0,1.06l3.35,3.35L8.94,7.88z"/>
+  <path
+      android:fillColor="@color/titleTextColor"
+      android:pathData="M12.12,11.06l-1.06,1.06l2.41,2.41l-0.62,0.62C12.54,15.46 12.76,16 13.21,16h2.29c0.28,0 0.5,-0.22 0.5,-0.5v-2.29c0,-0.45 -0.54,-0.67 -0.85,-0.35l-0.62,0.62L12.12,11.06z"/>
+  <path
+      android:fillColor="@color/titleTextColor"
+      android:pathData="M12.85,4.85l0.62,0.62l-8.94,8.94c-0.29,0.29 -0.29,0.77 0,1.06l0,0c0.29,0.29 0.77,0.29 1.06,0l8.94,-8.94l0.62,0.62C15.46,7.46 16,7.24 16,6.79V4.5C16,4.22 15.78,4 15.5,4h-2.29C12.76,4 12.54,4.54 12.85,4.85z"/>
 </vector>
diff --git a/app/src/main/res/drawable-v24/ic_toolbar_motion_on.xml b/app/src/main/res/drawable/ic_toolbar_motion_on.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_toolbar_motion_on.xml
rename to app/src/main/res/drawable/ic_toolbar_motion_on.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e71bcd5..cedf2046 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -117,7 +117,7 @@
     <string name="playlist_chooser_dialog_neutral_button">Create</string>
     <string name="playlist_chooser_dialog_title">Add to a playlist</string>
     <string name="playlist_counted_tracks">%1$d tracks</string>
-    <string name="playlist_duration">Playlist duration: %1$s</string>
+    <string name="playlist_duration">Duration  •  %1$s</string>
     <string name="playlist_editor_dialog_hint_name">Playlist Name</string>
     <string name="playlist_editor_dialog_negative_button">Cancel</string>
     <string name="playlist_editor_dialog_neutral_button">Delete</string>
@@ -126,7 +126,7 @@
     <string name="playlist_info_song_count">Song count: %1$d</string>
     <string name="playlist_page_play_button">Play</string>
     <string name="playlist_page_shuffle_button">Shuffle</string>
-    <string name="playlist_song_count">Song count: %1$d</string>
+    <string name="playlist_song_count">Playlist  •  %1$d songs</string>
     <string name="rating_dialog_negative_button">Cancel</string>
     <string name="rating_dialog_positive_button">Save</string>
     <string name="rating_dialog_title">Rate</string>