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

fixed realignment item badges
Conflicts:
	res/layout/list_item.xml

diff --git a/owncloud-android-library b/owncloud-android-library
index ecc3415..17bb724 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199
+Subproject commit 17bb724b4207142d631a5f1c70d1e80c447e2310

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index a3918c7..49bae2a 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -32,7 +32,7 @@
         <FrameLayout\r
             android:layout_width="60dp"\r
             android:layout_height="72dp"\r
-            android:paddingLeft="@dimen/standard_padding"\r
+            android:paddingLeft="12dp"\r
             android:paddingBottom="@dimen/standard_padding"\r
             android:paddingTop="@dimen/standard_padding"\r
             android:paddingRight="4dp"\r
@@ -44,7 +44,7 @@
                 android:layout_width="@dimen/file_icon_size"\r
                 android:layout_height="@dimen/file_icon_size"\r
                 android:layout_gravity="top|right"\r
-                android:layout_marginLeft="21dp"\r
+                android:layout_marginRight="4dp"\r
                 android:src="@drawable/local_file_indicator" />\r
 \r
             <ImageView\r
@@ -59,7 +59,7 @@
                 android:layout_width="wrap_content"\r
                 android:layout_height="wrap_content"\r
                 android:layout_gravity="bottom|right"\r
-                android:layout_marginRight="2dp"\r
+                android:layout_marginRight="4dp"\r
                 android:src="@drawable/ic_favorite" />\r
         </FrameLayout>\r
 \r