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

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

diff --combined 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 --combined 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
@@@ -22,7 -22,7 +22,7 @@@
      android:layout_width="match_parent"\r
      android:background="@drawable/list_selector"\r
      android:orientation="vertical"\r
 -    android:layout_height="56dp">\r
 +    android:layout_height="72dp">\r
  \r
      <LinearLayout\r
          android:layout_width="match_parent"\r
@@@ -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,15 -39,16 +43,15 @@@
                  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
                  android:id="@+id/thumbnail"\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="12dp"\r
 +                android:layout_gravity="left|center_vertical"\r
                  android:src="@drawable/ic_menu_archive" />\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
@@@ -67,8 -65,7 +67,8 @@@
              android:layout_width="0dp"\r
              android:layout_height="match_parent"\r
              android:layout_weight="1"\r
 -            android:gravity="center_vertical"\r
 +            android:gravity="top"\r
 +            android:paddingTop="@dimen/standard_padding"\r
              android:orientation="vertical" >\r
  \r
              <TextView\r
@@@ -76,37 -73,29 +76,37 @@@
                  android:layout_width="wrap_content"\r
                  android:layout_height="wrap_content"\r
                  android:layout_gravity="center_vertical"\r
 -                android:layout_marginLeft="4dp"\r
 +                android:layout_marginLeft="0dp"\r
                  android:layout_marginRight="4dp"\r
                  android:ellipsize="middle"\r
                  android:singleLine="true"\r
                  android:text="TextView"\r
                  android:textColor="#303030"\r
 -                android:textSize="16dip" />\r
 +                android:textSize="@dimen/two_line_primary_text_size" />\r
  \r
              <LinearLayout\r
                  android:layout_width="match_parent"\r
                  android:layout_height="wrap_content"\r
 -                android:layout_marginLeft="4dp"\r
 +                android:layout_marginLeft="0dp"\r
                  android:layout_marginRight="4dp"\r
 -                android:weightSum="1">\r
 +                android:orientation="horizontal">\r
  \r
                  <TextView\r
                      android:id="@+id/last_mod"\r
                      android:layout_width="wrap_content"\r
                      android:layout_height="wrap_content"\r
                      android:text="TextView"\r
 -                    android:layout_weight=".5"\r
                      android:textColor="@color/list_item_lastmod_and_filesize_text"\r
 -                    android:textSize="12dip"/>\r
 +                    android:textSize="@dimen/two_line_secondary_text_size"/>\r
 +\r
 +                <TextView\r
 +                    android:id="@+id/file_separator"\r
 +                    android:layout_width="wrap_content"\r
 +                    android:layout_height="wrap_content"\r
 +                    android:gravity="right"\r
 +                    android:text=", "\r
 +                    android:textColor="@color/list_item_lastmod_and_filesize_text"\r
 +                    android:textSize="@dimen/two_line_secondary_text_size"/>\r
  \r
                  <TextView\r
                      android:id="@+id/file_size"\r
@@@ -115,7 -104,8 +115,7 @@@
                      android:gravity="right"\r
                      android:text="TextView"\r
                      android:textColor="@color/list_item_lastmod_and_filesize_text"\r
 -                    android:layout_weight=".5"\r
 -                    android:textSize="12dip"/>\r
 +                    android:textSize="@dimen/two_line_secondary_text_size"/>\r
  \r
              </LinearLayout>\r
  \r
@@@ -156,9 -146,9 +156,9 @@@
              android:layout_height="wrap_content"\r
              android:layout_gravity="center_vertical"\r
              android:layout_marginLeft="4dp"\r
 -            android:layout_marginRight="4dp"\r
 +            android:layout_marginRight="@dimen/standard_margin"\r
              android:gravity=""\r
 -            android:src="@android:drawable/checkbox_off_background" />\r
 +            android:src="@drawable/ic_checkbox_blank_outline" />\r
      </LinearLayout>\r
  \r
      <View\r