Merge branch 'master' into multi-select

This commit is contained in:
Karim Abou Zeid 2015-05-24 16:05:38 +02:00
commit 9835c595b2
2 changed files with 6 additions and 4 deletions

View file

@ -67,12 +67,14 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
new SimpleImageLoadingListener() {
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
paletteBlackAndWhite(holder.title, holder.artist, holder.footer);
if (usePalette)
paletteBlackAndWhite(holder.title, holder.artist, holder.footer);
}
@Override
public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
applyPalette(loadedImage, holder.title, holder.artist, holder.footer);
if (usePalette)
applyPalette(loadedImage, holder.title, holder.artist, holder.footer);
}
}
);