commit 49634672f05d43ae4a57e654d8df289241df2189
author Marco Nelissen <marcone@google.com> Tue Sep 28 17:38:31 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 28 17:38:31 2010 -0700
tree 33996d80181e6b4dc3cd4776859b85487df91e91
parent 3e89ed12394e24b82d753c6c360bf59d07a729c2
parent 966c15afbf27e2cdbaee0b800d65d5ea403ddb22

am 966c15af: am 3f502de8: Make party shuffle use the history too, making it less random, but more like users expect. http://b/2535828

Merge commit '966c15afbf27e2cdbaee0b800d65d5ea403ddb22'

* commit '966c15afbf27e2cdbaee0b800d65d5ea403ddb22':
  Make party shuffle use the history too, making it less random, but more like

res/values-de/strings.xml

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 668160a..e674ef4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -24,7 +24,7 @@
     <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> Titel"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> von  <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> Liedern"</item>
+    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> von \n<xliff:g id="TOTAL_COUNT">%1$d</xliff:g> Liedern"</item>
   </plurals>
   <plurals name="Nalbums">
     <item quantity="one" msgid="3798955510439465932">"1 Album"</item>

src/com/android/music/MediaPlaybackActivity.java

diff --git a/src/com/android/music/MediaPlaybackActivity.java b/src/com/android/music/MediaPlaybackActivity.java
index e86b536..c90c49b 100644
--- a/src/com/android/music/MediaPlaybackActivity.java
+++ b/src/com/android/music/MediaPlaybackActivity.java
@@ -1318,7 +1318,9 @@
                 Message numsg = mHandler.obtainMessage(ALBUM_ART_DECODED, null);
                 mHandler.removeMessages(ALBUM_ART_DECODED);
                 mHandler.sendMessageDelayed(numsg, 300);
-                Bitmap bm = MusicUtils.getArtwork(MediaPlaybackActivity.this, songid, albumid);
+                // Don't allow default artwork here, because we want to fall back to song-specific
+                // album art if we can't find anything for the album.
+                Bitmap bm = MusicUtils.getArtwork(MediaPlaybackActivity.this, songid, albumid, false);
                 if (bm == null) {
                     bm = MusicUtils.getArtwork(MediaPlaybackActivity.this, songid, -1);
                     albumid = -1;

src/com/android/music/SortCursor.java

diff --git a/src/com/android/music/SortCursor.java b/src/com/android/music/SortCursor.java
index 9b17294..7482a3f 100644
--- a/src/com/android/music/SortCursor.java
+++ b/src/com/android/music/SortCursor.java
@@ -218,6 +218,11 @@
     }
 
     @Override
+    public int getType(int column) {
+        return mCursor.getType(column);
+    }
+
+    @Override
     public boolean isNull(int column)
     {
         return mCursor.isNull(column);

src/com/android/music/TrackBrowserActivity.java

diff --git a/src/com/android/music/TrackBrowserActivity.java b/src/com/android/music/TrackBrowserActivity.java
index 20e3060..c586fde 100644
--- a/src/com/android/music/TrackBrowserActivity.java
+++ b/src/com/android/music/TrackBrowserActivity.java
@@ -1278,6 +1278,11 @@
         }
 
         @Override
+        public int getType(int column) {
+            return mCurrentPlaylistCursor.getType(column);
+        }
+
+        @Override
         public boolean isNull(int column)
         {
             return mCurrentPlaylistCursor.isNull(column);