From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 4 Nov 2015 09:11:27 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151122~46
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4d33ecf15e9a4fa22e1e49e563793704c7598a3f?ds=inline;hp=--cc

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

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

4d33ecf15e9a4fa22e1e49e563793704c7598a3f
diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 40372e38,a41e4fe5..78a66b31
--- a/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);
                      fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
  
 -                    if (!file.isFolder()) {
 -                        AbsListView parentList = (AbsListView)parent;
 -                        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
 -                            if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {
 -                                checkBoxV.setVisibility(View.GONE);
 -                            } else {
 -                                if (parentList.isItemChecked(position)) {
 -                                    checkBoxV.setImageResource(
 -                                            R.drawable.ic_checkbox_marked);
 -                                } else {
 -                                    checkBoxV.setImageResource(
 -                                            R.drawable.ic_checkbox_blank_outline);
 -                                }
 -                                checkBoxV.setVisibility(View.VISIBLE);
 -                            }
 -                        }
 -
 -                    } else { //Folder
 +//                    if (!file.isFolder()) {
 +//                        AbsListView parentList = (AbsListView)parent;
 +//                        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
 +//                            if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {
 +//                                checkBoxV.setVisibility(View.GONE);
 +//                            } else {
 +//                                if (parentList.isItemChecked(position)) {
 +//                                    checkBoxV.setImageResource(
 +//                                            R.drawable.ic_checkbox_marked);
 +//                                } else {
 +//                                    checkBoxV.setImageResource(
 +//                                            R.drawable.ic_checkbox_blank_outline);
 +//                                }
 +//                                checkBoxV.setVisibility(View.VISIBLE);
 +//                            }
 +//                        }
 +
 +                    if (file.isFolder()) {
-                         fileSizeSeparatorV.setVisibility(View.INVISIBLE);
-                         fileSizeV.setVisibility(View.INVISIBLE);
+                         fileSizeSeparatorV.setVisibility(View.GONE);
+                         fileSizeV.setVisibility(View.GONE);
                      }
  
                  case GRID_ITEM: