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

Commit 5ceb3844 authored by cketti's avatar cketti
Browse files

Don't manually select vector drawables for notifications

parent e1ff5089

k9mail/src/main/java/com/fsck/k9/notification/BaseNotifications.java

+1 −2
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ abstract class BaseNotifications { 
    }



    private int getNewMailNotificationIcon() {

        return controller.platformSupportsVectorDrawables() ?

                R.drawable.notification_icon_new_mail : R.drawable.ic_notify_new_mail;

        return R.drawable.notification_icon_new_mail;

    }

}

k9mail/src/main/java/com/fsck/k9/notification/CertificateErrorNotifications.java

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ class CertificateErrorNotifications { 


    private int getCertificateErrorNotificationIcon() {

        //TODO: Use a different icon for certificate error notifications

        return controller.platformSupportsVectorDrawables() ?

                R.drawable.notification_icon_new_mail : R.drawable.ic_notify_new_mail;

        return R.drawable.notification_icon_new_mail;

    }



    private NotificationManagerCompat getNotificationManager() {

k9mail/src/main/java/com/fsck/k9/notification/DeviceNotifications.java

+3 −7
Original line number Diff line number Diff line
@@ -239,19 +239,15 @@ class DeviceNotifications extends BaseNotifications { 
    }



    private int getMarkAsReadActionIcon() {

        return controller.platformSupportsVectorDrawables() ?

                R.drawable.notification_action_mark_as_read : R.drawable.ic_action_mark_as_read_dark;

        return R.drawable.notification_action_mark_as_read;

    }



    private int getDeleteActionIcon() {

        return NotificationController.platformSupportsLockScreenNotifications() ?

                R.drawable.notification_action_delete : R.drawable.ic_action_delete_dark;

        return R.drawable.notification_action_delete;

    }



    private int getReplyActionIcon() {

        return controller.platformSupportsVectorDrawables() ?

                R.drawable.notification_action_reply :

                R.drawable.ic_action_single_message_options_dark;

        return R.drawable.notification_action_reply;

    }



    protected InboxStyle createInboxStyle(Builder builder) {

k9mail/src/main/java/com/fsck/k9/notification/NotificationController.java

+0 −4
Original line number Diff line number Diff line
@@ -135,10 +135,6 @@ public class NotificationController { 
        }

    }



    boolean platformSupportsVectorDrawables() {

        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;

    }



    String getAccountName(Account account) {

        String accountDescription = account.getDescription();

        return TextUtils.isEmpty(accountDescription) ? account.getEmail() : accountDescription;

k9mail/src/main/java/com/fsck/k9/notification/SendFailedNotifications.java

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ class SendFailedNotifications { 


    private int getSendFailedNotificationIcon() {

        //TODO: Use a different icon for send failure notifications

        return controller.platformSupportsVectorDrawables() ?

                R.drawable.notification_icon_new_mail : R.drawable.ic_notify_new_mail;

        return R.drawable.notification_icon_new_mail;

    }



    private NotificationManagerCompat getNotificationManager() {