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

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

diff --cc owncloud-android-library
index ecc3415,ecc3415..17bb724
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199
++Subproject commit 17bb724b4207142d631a5f1c70d1e80c447e2310

diff --cc res/layout/list_item.xml
index a3918c7,be0b94e..49bae2a
--- 1/res/layout/list_item.xml
--- 2/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -30,12 -30,8 +30,12 @@@
          android:orientation="horizontal">\r
  \r
          <FrameLayout\r
 -            android:layout_width="56dp"\r
 -            android:layout_height="56dp"\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
              android:focusable="false"\r
              android:focusableInTouchMode="false">\r
  \r
@@@ -43,8 -39,8 +43,8 @@@
                  android:id="@+id/localFileIndicator"\r
                  android:layout_width="@dimen/file_icon_size"\r
                  android:layout_height="@dimen/file_icon_size"\r
 -                android:layout_gravity="center_vertical"\r
 -                android:layout_marginLeft="22dp"\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 -56,8 +59,7 @@@
                  android:layout_width="wrap_content"\r
                  android:layout_height="wrap_content"\r
                  android:layout_gravity="bottom|right"\r
 -                android:layout_marginBottom="10dp"\r
--                android:layout_marginRight="2dp"\r
++                android:layout_marginRight="4dp"\r
                  android:src="@drawable/ic_favorite" />\r
          </FrameLayout>\r
  \r