Merge branch 'material_buttons' of https://github.com/owncloud/android into beta

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 40372e3..78a66b3 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -233,8 +233,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 //                        }\r
 \r
                     if (file.isFolder()) {\r
-                        fileSizeSeparatorV.setVisibility(View.INVISIBLE);\r
-                        fileSizeV.setVisibility(View.INVISIBLE);\r
+                        fileSizeSeparatorV.setVisibility(View.GONE);\r
+                        fileSizeV.setVisibility(View.GONE);\r
                     }\r
 \r
                 case GRID_ITEM:\r