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

diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml
index ac28fcf..bd8b12d 100644 (file)
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@@ -39,6 +39,8 @@
             android:id="@+id/list_root"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:divider="@color/list_divider_background"
+            android:dividerHeight="1px"
             android:visibility="visible" />
 
     </android.support.v4.widget.SwipeRefreshLayout>
@@ -131,4 +133,4 @@
             fab:fab_title=""/>
 
     </com.getbase.floatingactionbutton.FloatingActionsMenu>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>

diff --git a/res/values/colors.xml b/res/values/colors.xml
index b3c2d54..694e231 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,7 @@
     <color name="black_semi_transparent">#B2000000</color>
     <color name="textColor">@color/black</color>
     <color name="drawerMenuTextColor">#000000</color>
-    <color name="list_divider_background">#f8f8f8</color>
+    <color name="list_divider_background">#eee</color>
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="login_text_color">#757575</color>