diff options
Diffstat (limited to 'src')
4 files changed, 20 insertions, 4 deletions
diff --git a/src/com/cyanogenmod/eleven/cache/ImageFetcher.java b/src/com/cyanogenmod/eleven/cache/ImageFetcher.java index d6300bd..afa06c1 100644 --- a/src/com/cyanogenmod/eleven/cache/ImageFetcher.java +++ b/src/com/cyanogenmod/eleven/cache/ImageFetcher.java @@ -191,10 +191,9 @@ public class ImageFetcher extends ImageWorker { boolean smallArtwork) { // Check the disk cache Bitmap artwork = null; - String key = albumName; + String key = String.valueOf(albumId); if (artwork == null && albumName != null && mImageCache != null) { - key = generateAlbumCacheKey(albumName, artistName); artwork = mImageCache.getBitmapFromDiskCache(key); } if (artwork == null && albumId >= 0 && mImageCache != null) { diff --git a/src/com/cyanogenmod/eleven/loaders/SortedCursor.java b/src/com/cyanogenmod/eleven/loaders/SortedCursor.java index 7c2a5d0..2f8a3c9 100644 --- a/src/com/cyanogenmod/eleven/loaders/SortedCursor.java +++ b/src/com/cyanogenmod/eleven/loaders/SortedCursor.java @@ -117,7 +117,8 @@ public class SortedCursor extends AbstractCursor { * @return the extra object data that was passed in to be attached to the current row */ public Object getExtraData() { - return mExtraData.get(getPosition()); + int position = getPosition(); + return position < mExtraData.size() ? mExtraData.get(position) : null; } @Override diff --git a/src/com/cyanogenmod/eleven/widgets/EqualizerView.java b/src/com/cyanogenmod/eleven/widgets/EqualizerView.java index 5b8baa5..147fbcf 100644 --- a/src/com/cyanogenmod/eleven/widgets/EqualizerView.java +++ b/src/com/cyanogenmod/eleven/widgets/EqualizerView.java @@ -94,7 +94,7 @@ public class EqualizerView extends VisualizerView { byte rfk = data.bytes[mDivisions * i]; byte ifk = data.bytes[mDivisions * i + 1]; float magnitude = (rfk * rfk + ifk * ifk); - int dbValue = (int) (10 * Math.log10(magnitude)); + int dbValue = magnitude > 0 ? (int) (10 * Math.log10(magnitude)) : 0; mFFTPoints[i * 4 + 1] = rect.height(); mFFTPoints[i * 4 + 3] = rect.height() - (dbValue * mDbFuzzFactor + mDbFuzz); diff --git a/src/com/cyanogenmod/eleven/widgets/LetterTileDrawable.java b/src/com/cyanogenmod/eleven/widgets/LetterTileDrawable.java index 24cb8e2..176c216 100644 --- a/src/com/cyanogenmod/eleven/widgets/LetterTileDrawable.java +++ b/src/com/cyanogenmod/eleven/widgets/LetterTileDrawable.java @@ -258,6 +258,15 @@ public class LetterTileDrawable extends Drawable { mOffset = offset; } + /** + * Sets the tile data used to determine the display text and color + * @param displayName the name to display - Some logic will be applied to do some trimming + * and up to the first two letters will be displayed + * @param identifier the identifier used to determine the color of the background. For + * album, use albumId, for artist use artistName and for playlist use + * playlistId + * @param type the type of item that this tile drawable corresponds to + */ public void setTileDetails(final String displayName, final String identifier, final ImageType type) { mDisplayName = MusicUtils.getTrimmedName(displayName); @@ -292,6 +301,13 @@ public class LetterTileDrawable extends Drawable { /** * Draws the default letter tile drawable for the image type to a bitmap + * @param identifier the identifier used to determine the color of the background. For + * album, use albumId, for artist use artistName and for playlist use + * playlistId + * @param type the type of item that this tile drawable corresponds to + * @param isCircle whether to draw a circle or a square + * @param smallArtwork true if you want to draw a smaller version of the default bitmap for + * perf/memory reasons */ public static Bitmap createDefaultBitmap(Context context, String identifier, ImageType type, boolean isCircle, boolean smallArtwork) { |