Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 88e64b1..03f5ddc 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -28,10 +28,15 @@ import android.accounts.OperationCanceledException;
 import android.content.Context;\r
 import android.content.res.Resources;\r
 import android.graphics.Bitmap;\r
+<<<<<<< HEAD
 import android.graphics.Bitmap.CompressFormat;\r
 import android.graphics.BitmapFactory;\r
 import android.media.ThumbnailUtils;\r
 import android.os.AsyncTask;\r
+=======
+import android.graphics.BitmapFactory;\r
+import android.media.ThumbnailUtils;\r
+>>>>>>> c0dc4c42d71eb9593ff48a02a8af74bd7df8776e
 import android.util.TypedValue;\r
 import android.view.LayoutInflater;\r
 import android.view.View;\r
@@ -263,10 +268,10 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
             view = inflator.inflate(R.layout.list_item, null);\r
         }\r
-    \r
+         \r
         if (mFiles != null && mFiles.size() > position) {\r
             OCFile file = mFiles.get(position);\r
-            TextView fileName = (TextView) view.findViewById(R.id.Filename);\r
+            TextView fileName = (TextView) view.findViewById(R.id.Filename);           \r
             String name = file.getFileName();\r
 \r
             fileName.setText(name);\r
@@ -320,6 +325,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     }\r
                     checkBoxV.setVisibility(View.VISIBLE);\r
                 }\r
+<<<<<<< HEAD
                 \r
                 // first set thumbnail according to Mimetype, prevents empty thumbnails\r
                 fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r
@@ -336,6 +342,20 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     }\r
                 }\r
                 \r
+=======
+\r
+                // generate Thumbnail if file is available local and image\r
+                if (file.isDown() && file.isImage()){\r
+                    // Converts dp to pixel\r
+                    Resources r = mContext.getResources();\r
+                    int px = (int) Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 150, r.getDisplayMetrics()));\r
+                    Bitmap bitmap = BitmapFactory.decodeFile(file.getStoragePath());\r
+                    fileIcon.setImageBitmap(ThumbnailUtils.extractThumbnail(bitmap, px, px));\r
+                } else {\r
+                    fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));  \r
+                }\r
+\r
+>>>>>>> c0dc4c42d71eb9593ff48a02a8af74bd7df8776e
                 if (checkIfFileIsSharedWithMe(file)) {\r
                     sharedWithMeIconV.setVisibility(View.VISIBLE);\r
                 }\r