From 8d90b3fbf160650135fc9658b753e39bb56f1508 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 22 Sep 2015 08:50:54 +0200 Subject: swapped icons for foreground services --- .../siacs/conversations/services/ExportLogsService.java | 3 ++- .../siacs/conversations/services/NotificationService.java | 4 +--- src/main/res/drawable-hdpi/ic_link_white_24dp.png | Bin 0 -> 430 bytes src/main/res/drawable-mdpi/ic_link_white_24dp.png | Bin 0 -> 297 bytes src/main/res/drawable-xhdpi/ic_link_white_24dp.png | Bin 0 -> 494 bytes src/main/res/drawable-xxhdpi/ic_link_white_24dp.png | Bin 0 -> 670 bytes src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png | Bin 0 -> 865 bytes 7 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_link_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_link_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_link_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_link_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png diff --git a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java b/src/main/java/eu/siacs/conversations/services/ExportLogsService.java index 41b34699..8501c04a 100644 --- a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java +++ b/src/main/java/eu/siacs/conversations/services/ExportLogsService.java @@ -4,6 +4,7 @@ import android.app.NotificationManager; import android.app.Service; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.IBinder; import android.support.v4.app.NotificationCompat; @@ -48,7 +49,7 @@ public class ExportLogsService extends Service { NotificationManager mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(getBaseContext()); mBuilder.setContentTitle(getString(R.string.notification_export_logs_title)) - .setSmallIcon(R.drawable.ic_notification) + .setSmallIcon(R.drawable.ic_import_export_white_24dp) .setProgress(conversations.size(), 0, false); startForeground(NOTIFICATION_ID, mBuilder.build()); diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 18700916..4fd7fde7 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -497,16 +497,14 @@ public class NotificationService { final int cancelIcon; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { mBuilder.setCategory(Notification.CATEGORY_SERVICE); - mBuilder.setSmallIcon(R.drawable.ic_import_export_white_24dp); cancelIcon = R.drawable.ic_cancel_white_24dp; } else { - mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export); cancelIcon = R.drawable.ic_action_cancel; } + mBuilder.setSmallIcon(R.drawable.ic_link_white_24dp); mBuilder.addAction(cancelIcon, mXmppConnectionService.getString(R.string.disable_foreground_service), createDisableForeground()); - setNotificationColor(mBuilder); return mBuilder.build(); } diff --git a/src/main/res/drawable-hdpi/ic_link_white_24dp.png b/src/main/res/drawable-hdpi/ic_link_white_24dp.png new file mode 100644 index 00000000..4186e00c Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_link_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_link_white_24dp.png b/src/main/res/drawable-mdpi/ic_link_white_24dp.png new file mode 100644 index 00000000..6960502e Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_link_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_link_white_24dp.png b/src/main/res/drawable-xhdpi/ic_link_white_24dp.png new file mode 100644 index 00000000..984b572a Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_link_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png new file mode 100644 index 00000000..8e96c356 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png new file mode 100644 index 00000000..df2faf36 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png differ -- cgit v1.2.3