Merge branch 'master' into new-about-screen

app/src/main/assets/changelog.html

@@ -28,7 +28,11 @@
 <h3>Version 0.9.44 beta6</h3>
 
 <ol>
+    <li><b>FIX:</b> Even though the Last.fm app and web page say something is scrobbling, the
+        scrobble doesn't actually get saved at the end. <i>Thanks to Tim Malseed for that.</i>
+    </li>
     <li><b>FIX:</b> Fixed the plural typo in the artist list.</li>
+    <li><b>FIX:</b> Toolbar had no shadow in the playlist view.</li>
 </ol>
 
 <h3>Version 0.9.44 beta5</h3>
@@ -38,8 +42,8 @@
     <li><b>FIX:</b> Song detail dialog padding.</li>
     <li><b>FIX:</b> Sleep timer dialog retains its current time on rotate.</li>
     <li><b>IMPROVEMENT:</b> No longer "consume" purchases. This means that your donations are saved
-        from now on. I made this, so that just in case I make a paid version onetime in future, I
+        from now on. <i>I made this, so that just in case I make a paid version onetime in future, I
-        know who has already donated before so I can unlock the paid version for them.
+            know who has already donated before so I can unlock the paid version for them.</i>
     </li>
 </ol>
 
@@ -67,8 +71,8 @@
 </ol>
 
 <ol>
-    <li><b>IMPROVEMENT:</b> Completely rewritten color chooser. Had great help from <a
+    <li><b>IMPROVEMENT:</b> Completely rewritten color chooser. <i>Had great help from <a
-            href="https://plus.google.com/u/0/+AidanFollestad">Aidan Follestad</a> here once again.
+            href="https://plus.google.com/u/0/+AidanFollestad">Aidan Follestad</a> here once again.</i>
     </li>
     <li><b>IMPROVEMENT:</b> Increased album cover quality when selecting the "ignore media store
         covers" option.
@@ -79,10 +83,8 @@
     </li>
     <li><b>FIX:</b> Favorites playlist heart icon not showing up when initially added until restart.
     </li>
-    <li><b>FIX:</b> Hopefully fixed the bug where the alternative progress slider always stayed
+    <li><b>FIX:</b> Fixed the bug where the alternative progress slider always stayed
-        black on some devices. Please report if the bug is fixed at the <a
+        black on some devices.
-                href="https://plus.google.com/u/0/communities/106227738496107108513">Google+
-            Community</a>.
     </li>
 </ol>
 

app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java

@@ -822,6 +822,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
             internalIntent.putExtra("artist", currentSong.artistName);
             internalIntent.putExtra("album", currentSong.albumName);
             internalIntent.putExtra("track", currentSong.title);
+            internalIntent.putExtra("duration", currentSong.duration);
         }
         internalIntent.putExtra("playing", isPlaying());
         sendStickyBroadcast(internalIntent);

app/src/main/res/layout/activity_playlist_detail.xml

@@ -14,6 +14,7 @@
             android:clipToPadding="false"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?colorPrimary"
             android:elevation="@dimen/toolbar_elevation"
             tools:ignore="UnusedAttribute">