Add text icon in decrypt list

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
This commit is contained in:
Dominik Schürmann authored and Vincent Breitmoser committed 2015-09-16 17:21:38 +02:00
1 parent 24f2a9468c
commit ce105d955f
7 files changed
+4 -1

No files matched your search

+1
View File
@@ -44,6 +44,7 @@ python copy OpenKeychain social grey person 48
python copy OpenKeychain communication grey email 24 python copy OpenKeychain communication grey email 24
python copy OpenKeychain social black share 24 python copy OpenKeychain social black share 24
python copy OpenKeychain content black content_copy 24 python copy OpenKeychain content black content_copy 24
python copy OpenKeychain communication black chat 24
# navigation drawer sections # navigation drawer sections
python copy OpenKeychain communication black vpn_key 24 python copy OpenKeychain communication black vpn_key 24
@@ -324,7 +324,9 @@ public class DecryptListFragment
Drawable icon = null; 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); int px = FormattingUtils.dpToPx(context, 48);
Bitmap bitmap = FileHelper.getThumbnail(context, outputUri, new Point(px, px)); Bitmap bitmap = FileHelper.getThumbnail(context, outputUri, new Point(px, px));
icon = new BitmapDrawable(context.getResources(), bitmap); icon = new BitmapDrawable(context.getResources(), bitmap);
Binary file not shown.

After

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 316 B