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

Commit 4330af6f authored by cketti's avatar cketti
Browse files

Merge pull request #983 from k9mail/vector_drawables_cleanup 

Notification icons cleanup
parents 9e8bd2e3 5ceb3844

k9mail/build.gradle

+2 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,8 @@ android { 
        minSdkVersion 15

        minSdkVersion 15

        targetSdkVersion 22

        targetSdkVersion 22





        generatedDensities = ['mdpi', 'hdpi', 'xhdpi']



        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

    }

    }

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

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

    }





    private int getNewMailNotificationIcon() {

    private int getNewMailNotificationIcon() {

        return controller.platformSupportsVectorDrawables() ?

        return R.drawable.notification_icon_new_mail;

                R.drawable.ic_notify_new_mail_vector : R.drawable.ic_notify_new_mail;

    }

    }

}
 
}

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

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




    private int getCertificateErrorNotificationIcon() {

    private int getCertificateErrorNotificationIcon() {

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

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

        return controller.platformSupportsVectorDrawables() ?

        return R.drawable.notification_icon_new_mail;

                R.drawable.ic_notify_new_mail_vector : R.drawable.ic_notify_new_mail;

    }

    }





    private NotificationManagerCompat getNotificationManager() {

    private NotificationManagerCompat getNotificationManager() {

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

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

    }





    private int getMarkAsReadActionIcon() {

    private int getMarkAsReadActionIcon() {

        return controller.platformSupportsVectorDrawables() ?

        return R.drawable.notification_action_mark_as_read;

                R.drawable.ic_action_mark_as_read_dark_vector : R.drawable.ic_action_mark_as_read_dark;

    }

    }





    private int getDeleteActionIcon() {

    private int getDeleteActionIcon() {

        return NotificationController.platformSupportsLockScreenNotifications() ?

        return R.drawable.notification_action_delete;

                R.drawable.ic_action_delete_dark_vector : R.drawable.ic_action_delete_dark;

    }

    }





    private int getReplyActionIcon() {

    private int getReplyActionIcon() {

        return controller.platformSupportsVectorDrawables() ?

        return R.drawable.notification_action_reply;

                R.drawable.ic_action_single_message_options_dark_vector :

                R.drawable.ic_action_single_message_options_dark;

    }

    }





    protected InboxStyle createInboxStyle(Builder builder) {

    protected InboxStyle createInboxStyle(Builder builder) {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ class LockScreenNotification { 
                newMessages, newMessages);

                newMessages, newMessages);





        return controller.createNotificationBuilder()

        return controller.createNotificationBuilder()

                .setSmallIcon(R.drawable.ic_notify_new_mail_vector)

                .setSmallIcon(R.drawable.notification_icon_new_mail)

                .setColor(account.getChipColor())

                .setColor(account.getChipColor())

                .setNumber(unreadCount)

                .setNumber(unreadCount)

                .setContentTitle(title);

                .setContentTitle(title);