From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 2 Nov 2015 13:17:31 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151122~51
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/37d67265bd60a76f350a9941d8f59cdd82d38603?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
---

37d67265bd60a76f350a9941d8f59cdd82d38603
diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 40372e38,e9e96145..836ecccc
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -202,10 -193,10 +202,10 @@@ public class FileListListAdapter extend
  
              switch (viewType){
                  case LIST_ITEM:
-                     TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
+                     TextView fileSizeV = (TextView) view.findViewById(R.id.last_size);
                      TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
-                     TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
+                     TextView lastModV = (TextView) view.findViewById(R.id.file_mod);
 -                    ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
 +
  
                      lastModV.setVisibility(View.VISIBLE);
                      lastModV.setText(showRelativeTimestamp(file));