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

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

ef80135674470b6159f94b0606548ef3aa10f994
diff --combined res/layout/list_item.xml
index 376e4290,a72bdafa..17b098aa
--- 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
@@@ -95,7 -95,7 +95,7 @@@
                      android:id="@+id/last_size"
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
-                     android:text="TextView"
+                     android:text="Size MB"
                      android:textColor="@color/list_item_lastmod_and_filesize_text"
                      android:textSize="@dimen/two_line_secondary_text_size"/>
  
@@@ -113,7 -113,7 +113,7 @@@
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
                      android:gravity="right"
-                     android:text="TextView"
+                     android:text="Mod Date"
                      android:textColor="@color/list_item_lastmod_and_filesize_text"
                      android:textSize="@dimen/two_line_secondary_text_size"/>