Merge remote-tracking branch 'remotes/upstream/material_fab' into beta

[pub/Android/ownCloud.git] / res / layout / share_file_layout.xml

diff --git a/res/layout/share_file_layout.xml b/res/layout/share_file_layout.xml
index 39251a5..27a6133 100644 (file)
--- a/res/layout/share_file_layout.xml
+++ b/res/layout/share_file_layout.xml
@@ -17,10 +17,10 @@
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.owncloud.android.ui.fragment.ShareFileFragment"
-    >
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:context="com.owncloud.android.ui.fragment.ShareFileFragment"
+            android:id="@+id/shareScroll">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -153,7 +153,9 @@
                 android:layout_alignParentStart="true"
                 android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
                 android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
-                android:padding="8dp"
+                android:paddingTop="8dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
                 android:text="@string/share_via_link_expiration_date_label"
                 android:textSize="16sp"
                 />
@@ -167,7 +169,9 @@
                 android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
                 android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
                 android:layout_below="@id/shareViaLinkExpirationLabel"
-                android:padding="8dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:paddingBottom="8dp"
                 android:textSize="12sp"
                 />
 
@@ -197,7 +201,9 @@
                 android:layout_alignParentStart="true"
                 android:layout_toLeftOf="@id/shareViaLinkPasswordSwitch"
                 android:layout_toStartOf="@id/shareViaLinkPasswordSwitch"
-                android:padding="8dp"
+                android:paddingTop="8dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
                 android:text="@string/share_via_link_password_label"
                 android:textSize="16sp"
                 />
@@ -211,7 +217,9 @@
                 android:layout_toLeftOf="@id/shareViaLinkPasswordSwitch"
                 android:layout_toStartOf="@id/shareViaLinkPasswordSwitch"
                 android:layout_below="@id/shareViaLinkPasswordLabel"
-                android:padding="8dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:paddingBottom="8dp"
                 android:text="@string/share_via_link_password_title"
                 android:textSize="12sp"
                 android:visibility="invisible"
@@ -220,7 +228,7 @@
         </RelativeLayout>
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/shareViewLinkGetLinkButton"
+            android:id="@+id/shareViaLinkGetLinkButton"
             style="@style/ownCloud.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"