merge code, and adjust code

2016-02-05 17:09:29 +01:00 · 2016-02-05 17:09:29 +01:00 · 7cc1c0fbdd
commit 7cc1c0fbdd
parent 241414f81b
29 changed files with 412 additions and 727 deletions
--- a/app/src/main/res/layout/player_notification.xml
+++ b/app/src/main/res/layout/player_notification.xml
@ -51,7 +51,7 @@
        android:background="#00ffffff"
        android:clickable="true"
        android:scaleType="fitXY"
-        android:src="@drawable/ic_play_arrow_white_48dp" />
+        android:src="@drawable/ic_pause_white_24dp" />

    <ImageButton
        android:id="@+id/backgroundStop"