From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 16 Sep 2015 14:31:42 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~43
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/509f833535c5444125c6fb0cb9c365250054b607?ds=inline;hp=-c

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

509f833535c5444125c6fb0cb9c365250054b607
diff --combined res/layout/list_item.xml
index c18aee7a,49bae2a1..754fd9e8
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -32,7 -32,7 +32,7 @@@
          <FrameLayout
              android:layout_width="60dp"
              android:layout_height="72dp"
-             android:paddingLeft="@dimen/standard_padding"
+             android:paddingLeft="12dp"
              android:paddingBottom="@dimen/standard_padding"
              android:paddingTop="@dimen/standard_padding"
              android:paddingRight="4dp"
@@@ -44,7 -44,7 +44,7 @@@
                  android:layout_width="@dimen/file_icon_size"
                  android:layout_height="@dimen/file_icon_size"
                  android:layout_gravity="top|right"
-                 android:layout_marginLeft="21dp"
+                 android:layout_marginRight="4dp"
                  android:src="@drawable/local_file_indicator" />
  
              <ImageView
@@@ -59,7 -59,7 +59,7 @@@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_gravity="bottom|right"
-                 android:layout_marginRight="2dp"
+                 android:layout_marginRight="4dp"
                  android:src="@drawable/ic_favorite" />
          </FrameLayout>
  
@@@ -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