Merge remote-tracking branch 'upstream/video_thumbnail' into video_thumbnail

diff --cc owncloud-android-library
index f5fbca2,dbc8c32..4eb9ce4
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit f5fbca24becbb01660abe2a7013c1b536ea8a301
 -Subproject commit dbc8c325d74f3f7e8da8236c5abe77a141ae4019
++Subproject commit 4eb9ce4ba2d9272de561954b3638f5acde8b2ca5

diff --cc res/drawable-hdpi/view_play.png
index 0000000,57c9fa5..5371724
mode 000000,100644..100644
Binary files differ

diff --cc res/drawable-mdpi/view_play.png
index 0000000,c61e948..77b2027
mode 000000,100644..100644
Binary files differ

diff --cc res/drawable-xhdpi/view_play.png
index 0000000,a3c80e7..8482788
mode 000000,100644..100644
Binary files differ

diff --cc res/drawable-xxhdpi/view_play.png
index 0000000,547ef30..fea738b
mode 000000,100644..100644
Binary files differ

diff --cc res/drawable-xxxhdpi/view_play.png
index 0000000,be5c062..3786b4d
mode 000000,100644..100644
Binary files differ

diff --cc src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 0e59a83,07849e1..5806a40
--- 1/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
--- 2/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@@ -51,6 -55,6 +55,7 @@@ import com.owncloud.android.lib.resourc
  import com.owncloud.android.ui.adapter.DiskLruImageCache;
  import com.owncloud.android.utils.BitmapUtils;
  import com.owncloud.android.utils.DisplayUtils;
++import com.owncloud.android.utils.FileStorageUtils;
  
  /**
   * Manager for concurrent access to thumbnails cache.
@@@ -176,8 -180,20 +181,19 @@@ public class ThumbnailsCacheManager 
                  
                  if (mFile instanceof OCFile) {
                      thumbnail = doOCFileInBackground();
+ 
+                     if (((OCFile) mFile).isVideo()){
+                         thumbnail = addVideoOverlay(thumbnail);
+                     }
                  }  else if (mFile instanceof File) {
                      thumbnail = doFileInBackground();
 -                    FileNameMap fileNameMap = URLConnection.getFileNameMap();
 -                    String mMimeType = fileNameMap.getContentTypeFor("file://" + url);
+ 
+                     String url = ((File) mFile).getAbsolutePath();
++                    String mMimeType = FileStorageUtils.getMimeTypeFromName(url);
+ 
+                     if (mMimeType != null && mMimeType.startsWith("video/")){
+                         thumbnail = addVideoOverlay(thumbnail);
+                     }
                  //} else {  do nothing
                  }
  

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index a589512,5c0e8e8..26d77db
--- 1/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
--- 2/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -308,19 -316,20 +316,17 @@@ public class FileListListAdapter extend
                                      new ThumbnailsCacheManager.ThumbnailGenerationTask(\r
                                              fileIcon, mStorageManager, mAccount\r
                                              );\r
-                             if (thumbnail != null) {\r
-                                 final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =\r
-                                         new ThumbnailsCacheManager.AsyncDrawable(\r
-                                                 mContext.getResources(),\r
-                                                 thumbnail,\r
-                                                 task\r
-                                         );\r
-                                 fileIcon.setImageDrawable(asyncDrawable);\r
-                                 task.execute(file);\r
-                             } else {\r
-                                 fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(\r
-                                         file.getMimetype(), file.getFileName()));\r
+                             if (thumbnail == null) {\r
 -//                                thumbnail = ThumbnailsCacheManager.mDefaultImg;\r
 -                                Integer id = DisplayUtils.getFileTypeIconId(file.getMimetype(),\r
 -                                        file.getFileName());\r
 -                                thumbnail = BitmapFactory.decodeResource(mContext.getResources(), id);\r
++                                thumbnail = ThumbnailsCacheManager.mDefaultImg;\r
                              }\r
 -                                    mContext.getResources(),\r
 -                                    thumbnail,\r
+                             final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =\r
+                                     new ThumbnailsCacheManager.AsyncDrawable(\r
++                                    mContext.getResources(), \r
++                                    thumbnail, \r
+                                     task\r
+                                     );\r
+                             fileIcon.setImageDrawable(asyncDrawable);\r
+                             task.execute(file);\r
                          }\r
                      }\r
                  } else {\r