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

diff --combined res/layout/list_item.xml
index 754fd9e,680efe7..376e429
--- 1/res/layout/list_item.xml
--- 2/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -81,7 -81,7 +81,7 @@@
                  android:ellipsize="middle"\r
                  android:singleLine="true"\r
                  android:text="TextView"\r
 -                android:textColor="#303030"\r
 +                android:textColor="@color/textColor"\r
                  android:textSize="@dimen/two_line_primary_text_size" />\r
  \r
              <LinearLayout\r
@@@ -92,7 -92,7 +92,7 @@@
                  android:orientation="horizontal">\r
  \r
                  <TextView\r
-                     android:id="@+id/last_mod"\r
+                     android:id="@+id/last_size"\r
                      android:layout_width="wrap_content"\r
                      android:layout_height="wrap_content"\r
                      android:text="TextView"\r
@@@ -109,7 -109,7 +109,7 @@@
                      android:textSize="@dimen/two_line_secondary_text_size"/>\r
  \r
                  <TextView\r
-                     android:id="@+id/file_size"\r
+                     android:id="@+id/file_mod"\r
                      android:layout_width="wrap_content"\r
                      android:layout_height="wrap_content"\r
                      android:gravity="right"\r