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

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

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 40372e3,a41e4fe..78a66b3
--- 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
@@@ -215,26 -207,26 +215,26 @@@ public class FileListListAdapter extend
                      fileSizeV.setVisibility(View.VISIBLE);\r
                      fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
  \r
 -                    if (!file.isFolder()) {\r
 -                        AbsListView parentList = (AbsListView)parent;\r
 -                        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {\r
 -                            if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {\r
 -                                checkBoxV.setVisibility(View.GONE);\r
 -                            } else {\r
 -                                if (parentList.isItemChecked(position)) {\r
 -                                    checkBoxV.setImageResource(\r
 -                                            R.drawable.ic_checkbox_marked);\r
 -                                } else {\r
 -                                    checkBoxV.setImageResource(\r
 -                                            R.drawable.ic_checkbox_blank_outline);\r
 -                                }\r
 -                                checkBoxV.setVisibility(View.VISIBLE);\r
 -                            }\r
 -                        }\r
 -\r
 -                    } else { //Folder\r
 +//                    if (!file.isFolder()) {\r
 +//                        AbsListView parentList = (AbsListView)parent;\r
 +//                        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {\r
 +//                            if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {\r
 +//                                checkBoxV.setVisibility(View.GONE);\r
 +//                            } else {\r
 +//                                if (parentList.isItemChecked(position)) {\r
 +//                                    checkBoxV.setImageResource(\r
 +//                                            R.drawable.ic_checkbox_marked);\r
 +//                                } else {\r
 +//                                    checkBoxV.setImageResource(\r
 +//                                            R.drawable.ic_checkbox_blank_outline);\r
 +//                                }\r
 +//                                checkBoxV.setVisibility(View.VISIBLE);\r
 +//                            }\r
 +//                        }\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