Merge branch 'develop' into release-1.5.8

res/layout/list_item.xml

@@ -38,8 +38,8 @@
 
         <ImageView
             android:id="@+id/imageView1"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
             android:layout_gravity="center_vertical|center"
             android:layout_margin="4dp"
             android:src="@drawable/ic_menu_archive" />

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

@@ -119,6 +119,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             sharedWithMeIconV.setVisibility(View.GONE);
 
             ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);
+            localStateView.bringToFront();
             FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();
             FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();
             if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {
@@ -184,6 +185,12 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 } else {
                     fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));
                 }
+
+                // If folder is sharedByLink, icon folder must be changed to
+                // folder-public one
+                if (file.isShareByLink()) {
+                    fileIcon.setImageResource(R.drawable.folder_public);
+                }
             }
 
             if (file.isShareByLink()) {