diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-31 20:25:48 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-16 17:21:38 +0200 |
| commit | ce105d955fff57d8e7b90acbf823d66567e89290 (patch) | |
| tree | f2c1b057c2dcb61f94ffcb3ea20e9f326ee3ddb8 | |
| parent | 24f2a9468c2495d312aa5a8d05273ea644ab6da8 (diff) | |
| download | open-keychain-ce105d955fff57d8e7b90acbf823d66567e89290.tar.gz open-keychain-ce105d955fff57d8e7b90acbf823d66567e89290.tar.bz2 open-keychain-ce105d955fff57d8e7b90acbf823d66567e89290.zip | |
Add text icon in decrypt list
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
| -rwxr-xr-x | Graphics/get-material-icons.sh | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-hdpi/ic_chat_black_24dp.png | bin | 0 -> 158 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-mdpi/ic_chat_black_24dp.png | bin | 0 -> 129 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png | bin | 0 -> 193 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png | bin | 0 -> 248 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png | bin | 0 -> 316 bytes |
7 files changed, 4 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 000000000..fa4d2c14d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_chat_black_24dp.png 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 Binary files differnew file mode 100644 index 000000000..d239cfa09 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_chat_black_24dp.png 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 Binary files differnew file mode 100644 index 000000000..e9e92e5f8 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_chat_black_24dp.png 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 Binary files differnew file mode 100644 index 000000000..9102f25df --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_chat_black_24dp.png 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 Binary files differnew file mode 100644 index 000000000..55d42e284 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_chat_black_24dp.png |
