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: [PATCH] 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 +++- .../main/res/drawable-hdpi/ic_chat_black_24dp.png | Bin 0 -> 158 bytes .../main/res/drawable-mdpi/ic_chat_black_24dp.png | Bin 0 -> 129 bytes .../res/drawable-xhdpi/ic_chat_black_24dp.png | Bin 0 -> 193 bytes .../res/drawable-xxhdpi/ic_chat_black_24dp.png | Bin 0 -> 248 bytes .../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 0000000000000000000000000000000000000000..fa4d2c14d544db46351e1a83ffa4b8362ce29971 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8s;7%%NCo5DOB;Dx4R~BHMn7Hu zmQ$%RsGHMiE|bn7ZG%6*e+5T8`}?<`sjyJmFZq;Yck!|$Nv>tberY*A5pDirzNscO zKjo*~rwO48YwkBYv6ixml-v?bx#M|sK~jL>3JJd%_1003y%_dgZl4CUkipZ{&t;uc GLK6UvUOBt~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d239cfa099e80ce6d8d81fb69fe6e3ecf636235f GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*14^J1zkP61+1;QLD6(>K;XQ(;) zfIpl+%uiyUOU4g>l_fFEd=8u11fQy8WgloMx&DD^-8_${`(8*%b)2(bqLr=?YRMe% cQ-O(LXAw*39nJ3tfMzmyy85}Sb4q9e04}I1DgXcg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e9e92e5f809cd0a62b9a5867d57319d1a86fe31e GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D4o?@ykP61Pmo9QL849>wjP~7f zM%N=^>jsTu{-rtzEdq0ncg?i^|K5SaK6KmT6TH7ay_<9M@#2DmP49knS|l`<9}0DD zYgKAkb^+$!~a{p z33yLgpt{8Bpa$Do7l9`B(zOX3PLpb9ec%82K)F=fdCTc5EDO~A_pqy%t&v!uu0Y{H?S=IdQwvf_WR%cb+&D=glaYav?%8WrE{BXXgdq*EbwH zrO<4Uv9SI`f8kDr<~DwwS#@lZDFKaNvlfK$hGaKdO%htMn29&Q-`lt8y(8~Yp~nl3 wIrcV7v77Q`$y~8mQ5XOeXk>eS=l*xb9SQ35SK7Hw0eXeO)78&qol`;+0JGy`h5!Hn literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..55d42e28499517f1c528b181ffc0e5d70779ef44 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z{u?B;uuoF`1bsH-@^eCEFX7H zj0+I)TEaS|LGUPpX#t0qMVb9;6R)F z)<=DA`dg0auKxL5{srrIi|GZ<`nwt>=UzU=Bqgo3dy)7()5*3|*=&q&dS@Ouk)pi! zi<&i;fP%w;Nx~aSnBuq@SU3a}790p-WV-jyI^iXV=WrmC@%@)w!T||PbvG|DFfy^! z=x_@tB;4c#$~g#sILp%WvZ2;0VK#5Zn$3*X9&C4tr*UVzd3JaCov#yZqpva4GwxVY z^YFXpe*a&!m)=jVoB!qalKbj^?Ovh?soXU;HvY|GknLt);3PQ@7%B{&u6{1-oD!M< DBXoja literal 0 HcmV?d00001