From f8ce79b9ce5b8a81a2f7e91cf5ae237840ea55ec Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Wed, 23 Dec 2015 17:39:44 +0100 Subject: [PATCH] Use different metadata on ICS lockscreen --- .../blinkenlights/android/vanilla/RemoteControl.java | 2 +- ...trolImplKitKat.java => RemoteControlImplICS.java} | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) rename src/ch/blinkenlights/android/vanilla/{RemoteControlImplKitKat.java => RemoteControlImplICS.java} (92%) diff --git a/src/ch/blinkenlights/android/vanilla/RemoteControl.java b/src/ch/blinkenlights/android/vanilla/RemoteControl.java index 1b07b1e3..e28a73b3 100644 --- a/src/ch/blinkenlights/android/vanilla/RemoteControl.java +++ b/src/ch/blinkenlights/android/vanilla/RemoteControl.java @@ -29,7 +29,7 @@ public class RemoteControl { public RemoteControl.Client getClient(Context context) { return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? new RemoteControlImplLp(context) : - new RemoteControlImplKitKat(context) // legacy implementation, kept until we drop 4.x support + new RemoteControlImplICS(context) // legacy implementation, kept until we drop 4.x support ); } diff --git a/src/ch/blinkenlights/android/vanilla/RemoteControlImplKitKat.java b/src/ch/blinkenlights/android/vanilla/RemoteControlImplICS.java similarity index 92% rename from src/ch/blinkenlights/android/vanilla/RemoteControlImplKitKat.java rename to src/ch/blinkenlights/android/vanilla/RemoteControlImplICS.java index 30860260..2ad1db08 100644 --- a/src/ch/blinkenlights/android/vanilla/RemoteControlImplKitKat.java +++ b/src/ch/blinkenlights/android/vanilla/RemoteControlImplICS.java @@ -33,7 +33,7 @@ import android.media.AudioManager; import android.media.MediaMetadataRetriever; import android.media.RemoteControlClient; -public class RemoteControlImplKitKat implements RemoteControl.Client { +public class RemoteControlImplICS implements RemoteControl.Client { /** * Context of this instance */ @@ -53,7 +53,7 @@ public class RemoteControlImplKitKat implements RemoteControl.Client { * * @param context The context to use */ - public RemoteControlImplKitKat(Context context) { + public RemoteControlImplICS(Context context) { mContext = context; } @@ -136,8 +136,12 @@ public class RemoteControlImplKitKat implements RemoteControl.Client { remote.setPlaybackState(isPlaying ? RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED); RemoteControlClient.MetadataEditor editor = remote.editMetadata(true); if (song != null) { - editor.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, song.artist); - editor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, song.album); + + String artist_album = song.artist + " - " + song.album; + artist_album = (song.artist.length() == 0 ? song.album : artist_album); // no artist ? -> only display album + artist_album = (song.album.length() == 0 ? song.artist : artist_album); // no album ? -> only display artist + + editor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, artist_album); editor.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, song.title); Bitmap bitmap = song.getCover(mContext); if (bitmap != null && mShowCover == 1 && (isPlaying || keepPaused)) {