From: tobiasKaminsky Date: Thu, 29 Oct 2015 17:38:07 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/upstream/videoBigThumbnails' into beta X-Git-Tag: beta-20151122~85 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ee25589d707182cdf280cf7730f3c4c94a41d664?hp=f1113a67c5a683e546518d0f964067f59f50ab28 Merge remote-tracking branch 'remotes/upstream/videoBigThumbnails' into beta --- diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 5e6b3bbe..900d186c 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -154,7 +154,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { ViewType viewType; if (!mGridMode){ viewType = ViewType.LIST_ITEM; - } else if (file.isImage()){ + } else if (file.isImage() || file.isVideo()){ viewType = ViewType.GRID_IMAGE; } else { viewType = ViewType.GRID_ITEM;