From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 2 Nov 2015 11:11:22 +0000 (+0100)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fdcd0829d60cd2cf23fbc9c05c1547b3d247c712?hp=-c

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

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