From ce105d955fff57d8e7b90acbf823d66567e89290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 31 Aug 2015 20:25:48 +0200 Subject: Add text icon in decrypt list Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java --- Graphics/get-material-icons.sh | 1 + .../keychain/ui/DecryptListFragment.java | 4 +++- .../src/main/res/drawable-hdpi/ic_chat_black_24dp.png | Bin 0 -> 158 bytes .../src/main/res/drawable-mdpi/ic_chat_black_24dp.png | Bin 0 -> 129 bytes .../src/main/res/drawable-xhdpi/ic_chat_black_24dp.png | Bin 0 -> 193 bytes .../src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png | Bin 0 -> 248 bytes .../src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png | Bin 0 -> 316 bytes 7 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_chat_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_chat_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index 67370afc2..d4d72e5b3 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -44,6 +44,7 @@ python copy OpenKeychain social grey person 48 python copy OpenKeychain communication grey email 24 python copy OpenKeychain social black share 24 python copy OpenKeychain content black content_copy 24 +python copy OpenKeychain communication black chat 24 # navigation drawer sections python copy OpenKeychain communication black vpn_key 24 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java index f7acd2f1c..cc7e0253c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java @@ -324,7 +324,9 @@ public class DecryptListFragment Drawable icon = null; - if (ClipDescription.compareMimeTypes(type, "image/*")) { + if (ClipDescription.compareMimeTypes(type, "text/plain")) { + icon = getResources().getDrawable(R.drawable.ic_chat_black_24dp); + } else if (ClipDescription.compareMimeTypes(type, "image/*")) { int px = FormattingUtils.dpToPx(context, 48); Bitmap bitmap = FileHelper.getThumbnail(context, outputUri, new Point(px, px)); icon = new BitmapDrawable(context.getResources(), bitmap); diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_chat_black_24dp.png new file mode 100644 index 000000000..fa4d2c14d Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_chat_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_chat_black_24dp.png new file mode 100644 index 000000000..d239cfa09 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_chat_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png new file mode 100644 index 000000000..e9e92e5f8 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png new file mode 100644 index 000000000..9102f25df Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png new file mode 100644 index 000000000..55d42e284 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png differ -- cgit v1.2.3