New all-white status bar icon to fix issue #1356

11 files changed, 21 insertions, 2 deletions

diff --git a/OpenKeychain/src/debug/res/drawable-hdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-hdpi/ic_stat_notify.png
new file mode 100644
index 000000000..b31481995
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-hdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/debug/res/drawable-mdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-mdpi/ic_stat_notify.png
new file mode 100644
index 000000000..39e799e5a
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-mdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/debug/res/drawable-xhdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-xhdpi/ic_stat_notify.png
new file mode 100644
index 000000000..af1613d40
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-xhdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/debug/res/drawable-xxhdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-xxhdpi/ic_stat_notify.png
new file mode 100644
index 000000000..9da107396
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-xxhdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_stat_notify.png b/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_stat_notify.png
new file mode 100644
index 000000000..5c81db8bf
--- /dev/null
+++ b/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index dbbfe3133..9679cb7bc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -36,6 +36,9 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.util.LongSparseArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
@@ -474,11 +477,26 @@ public class PassphraseCacheService extends Service {
         }
     }
 
+    // from de.azapps.mirakel.helper.Helpers from https://github.com/MirakelX/mirakel-android
+    private static Bitmap getBitmap(int resId, Context ctx) {
+        final int mLargeIconWidth = (int) ctx.getResources().getDimension(
+                                  android.R.dimen.notification_large_icon_width);
+        final int mLargeIconHeight = (int) ctx.getResources().getDimension(
+                                   android.R.dimen.notification_large_icon_height);
+        final Drawable d = ctx.getResources().getDrawable(resId);
+        final Bitmap b = Bitmap.createBitmap(mLargeIconWidth, mLargeIconHeight, Bitmap.Config.ARGB_8888);
+        final Canvas c = new Canvas(b);
+        d.setBounds(0, 0, mLargeIconWidth, mLargeIconHeight);
+        d.draw(c);
+        return b;
+    }
+
     private Notification getNotification() {
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            builder.setSmallIcon(R.drawable.ic_launcher)
+            builder.setSmallIcon(R.drawable.ic_stat_notify)
+                    .setLargeIcon(getBitmap(R.drawable.ic_launcher, getBaseContext()))
                     .setContentTitle(getString(R.string.app_name))
                     .setContentText(String.format(getString(R.string.passp_cache_notif_n_keys),
                             mPassphraseCache.size()));
@@ -510,7 +528,8 @@ public class PassphraseCacheService extends Service {
             );
         } else {
             // Fallback, since expandable notifications weren't available back then
-            builder.setSmallIcon(R.drawable.ic_launcher)
+            builder.setSmallIcon(R.drawable.ic_stat_notify)
+                    .setLargeIcon(getBitmap(R.drawable.ic_launcher, getBaseContext()))
                     .setContentTitle(String.format(getString(R.string.passp_cache_notif_n_keys),
                             mPassphraseCache.size()))
                     .setContentText(getString(R.string.passp_cache_notif_click_to_clear));
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify.png
new file mode 100644
index 000000000..b31481995
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify.png
new file mode 100644
index 000000000..39e799e5a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify.png
new file mode 100644
index 000000000..af1613d40
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify.png
new file mode 100644
index 000000000..9da107396
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify.png
new file mode 100644
index 000000000..5c81db8bf
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify.png