Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9db298e authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Clear fields that do not have metadata" into rvc-dev am: b7285f57 

Change-Id: I65c97ca0d0ed55365f40dd1756146423f0a4fa0f
parents 533753c3 b7285f57

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+23 −18
Original line number Original line Diff line number Diff line
@@ -315,11 +315,8 @@ public class MediaControlPanel { 
            appName.setTextColor(mForegroundColor);

            appName.setTextColor(mForegroundColor);

        }

        }





        // Can be null!

        MediaMetadata mediaMetadata = mController.getMetadata();

        MediaMetadata mediaMetadata = mController.getMetadata();

        if (mediaMetadata == null) {

            Log.e(TAG, "Media metadata was null");

            return;

        }





        ImageView albumView = mMediaNotifView.findViewById(R.id.album_art);

        ImageView albumView = mMediaNotifView.findViewById(R.id.album_art);

        if (albumView != null) {

        if (albumView != null) {
@@ -329,14 +326,20 @@ public class MediaControlPanel { 




        // Song name

        // Song name

        TextView titleText = mMediaNotifView.findViewById(R.id.header_title);

        TextView titleText = mMediaNotifView.findViewById(R.id.header_title);

        String songName = mediaMetadata.getString(MediaMetadata.METADATA_KEY_TITLE);

        String songName = "";

        if (mediaMetadata != null) {

            songName = mediaMetadata.getString(MediaMetadata.METADATA_KEY_TITLE);

        }

        titleText.setText(songName);

        titleText.setText(songName);

        titleText.setTextColor(mForegroundColor);

        titleText.setTextColor(mForegroundColor);





        // Artist name (not in mini player)

        // Artist name (not in mini player)

        TextView artistText = mMediaNotifView.findViewById(R.id.header_artist);

        TextView artistText = mMediaNotifView.findViewById(R.id.header_artist);

        if (artistText != null) {

        if (artistText != null) {

            String artistName = mediaMetadata.getString(MediaMetadata.METADATA_KEY_ARTIST);

            String artistName = "";

            if (mediaMetadata != null) {

                artistName = mediaMetadata.getString(MediaMetadata.METADATA_KEY_ARTIST);

            }

            artistText.setText(artistName);

            artistText.setText(artistName);

            artistText.setTextColor(mForegroundColor);

            artistText.setTextColor(mForegroundColor);

        }

        }
@@ -439,6 +442,7 @@ public class MediaControlPanel { 
    private void processAlbumArt(MediaMetadata metadata, Icon largeIcon, ImageView albumView) {

    private void processAlbumArt(MediaMetadata metadata, Icon largeIcon, ImageView albumView) {

        Bitmap albumArt = null;

        Bitmap albumArt = null;





        if (metadata != null) {

            // First look in URI fields

            // First look in URI fields

            for (String field : ART_URIS) {

            for (String field : ART_URIS) {

                String uriString = metadata.getString(field);

                String uriString = metadata.getString(field);
@@ -455,6 +459,7 @@ public class MediaControlPanel { 
            if (albumArt == null) {

            if (albumArt == null) {

                albumArt = metadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART);

                albumArt = metadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART);

            }

            }

        }





        // Finally try the notification's largeIcon

        // Finally try the notification's largeIcon

        if (albumArt == null && largeIcon != null) {

        if (albumArt == null && largeIcon != null) {