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

Merge branch 'master' of https://github.com/owncloud/android into material_buttons
fixed realignment item badges
Conflicts:
	res/layout/list_item.xml
---

94bc0699ace6ada85bcd52eef72434fb75bd882f
diff --combined owncloud-android-library
index ecc3415e,ecc3415e..17bb724b
--- a/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 a3918c72,be0b94ea..49bae2a1
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -22,7 -22,7 +22,7 @@@
      android:layout_width="match_parent"
      android:background="@drawable/list_selector"
      android:orientation="vertical"
 -    android:layout_height="56dp">
 +    android:layout_height="72dp">
  
      <LinearLayout
          android:layout_width="match_parent"
@@@ -30,12 -30,8 +30,12 @@@
          android:orientation="horizontal">
  
          <FrameLayout
 -            android:layout_width="56dp"
 -            android:layout_height="56dp"
 +            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"
              android:focusable="false"
              android:focusableInTouchMode="false">
  
@@@ -43,15 -39,16 +43,15 @@@
                  android:id="@+id/localFileIndicator"
                  android:layout_width="@dimen/file_icon_size"
                  android:layout_height="@dimen/file_icon_size"
 -                android:layout_gravity="center_vertical"
 -                android:layout_marginLeft="22dp"
 +                android:layout_gravity="top|right"
-                 android:layout_marginLeft="21dp"
++                android:layout_marginRight="4dp"
                  android:src="@drawable/local_file_indicator" />
  
              <ImageView
                  android:id="@+id/thumbnail"
                  android:layout_width="@dimen/file_icon_size"
                  android:layout_height="@dimen/file_icon_size"
 -                android:layout_gravity="center_vertical"
 -                android:layout_marginLeft="12dp"
 +                android:layout_gravity="left|center_vertical"
                  android:src="@drawable/ic_menu_archive" />
  
              <ImageView
@@@ -59,7 -56,8 +59,7 @@@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_gravity="bottom|right"
 -                android:layout_marginBottom="10dp"
--                android:layout_marginRight="2dp"
++                android:layout_marginRight="4dp"
                  android:src="@drawable/ic_favorite" />
          </FrameLayout>
  
@@@ -67,8 -65,7 +67,8 @@@
              android:layout_width="0dp"
              android:layout_height="match_parent"
              android:layout_weight="1"
 -            android:gravity="center_vertical"
 +            android:gravity="top"
 +            android:paddingTop="@dimen/standard_padding"
              android:orientation="vertical" >
  
              <TextView
@@@ -76,37 -73,29 +76,37 @@@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_gravity="center_vertical"
 -                android:layout_marginLeft="4dp"
 +                android:layout_marginLeft="0dp"
                  android:layout_marginRight="4dp"
                  android:ellipsize="middle"
                  android:singleLine="true"
                  android:text="TextView"
                  android:textColor="#303030"
 -                android:textSize="16dip" />
 +                android:textSize="@dimen/two_line_primary_text_size" />
  
              <LinearLayout
                  android:layout_width="match_parent"
                  android:layout_height="wrap_content"
 -                android:layout_marginLeft="4dp"
 +                android:layout_marginLeft="0dp"
                  android:layout_marginRight="4dp"
 -                android:weightSum="1">
 +                android:orientation="horizontal">
  
                  <TextView
                      android:id="@+id/last_mod"
                      android:layout_width="wrap_content"
                      android:layout_height="wrap_content"
                      android:text="TextView"
 -                    android:layout_weight=".5"
                      android:textColor="@color/list_item_lastmod_and_filesize_text"
 -                    android:textSize="12dip"/>
 +                    android:textSize="@dimen/two_line_secondary_text_size"/>
 +
 +                <TextView
 +                    android:id="@+id/file_separator"
 +                    android:layout_width="wrap_content"
 +                    android:layout_height="wrap_content"
 +                    android:gravity="right"
 +                    android:text=", "
 +                    android:textColor="@color/list_item_lastmod_and_filesize_text"
 +                    android:textSize="@dimen/two_line_secondary_text_size"/>
  
                  <TextView
                      android:id="@+id/file_size"
@@@ -115,7 -104,8 +115,7 @@@
                      android:gravity="right"
                      android:text="TextView"
                      android:textColor="@color/list_item_lastmod_and_filesize_text"
 -                    android:layout_weight=".5"
 -                    android:textSize="12dip"/>
 +                    android:textSize="@dimen/two_line_secondary_text_size"/>
  
              </LinearLayout>
  
@@@ -156,9 -146,9 +156,9 @@@
              android:layout_height="wrap_content"
              android:layout_gravity="center_vertical"
              android:layout_marginLeft="4dp"
 -            android:layout_marginRight="4dp"
 +            android:layout_marginRight="@dimen/standard_margin"
              android:gravity=""
 -            android:src="@android:drawable/checkbox_off_background" />
 +            android:src="@drawable/ic_checkbox_blank_outline" />
      </LinearLayout>
  
      <View