Merge branch 'master' into release-1.4.4

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 1c7921d..04da4be 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -40,14 +40,27 @@
             android:layout_marginTop="10dp"\r
             android:src="@drawable/logo" />\r
 \r
+        <Button\r
+            android:id="@+id/centeredRefreshButton"\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="wrap_content"\r
+            android:layout_gravity="center_horizontal"\r
+            android:layout_marginBottom="10dp"\r
+            android:onClick="onRefreshClick"\r
+            android:text="@string/auth_check_server"\r
+            android:visibility="gone" />\r
+\r
            <FrameLayout \r
+               android:id="@+id/hostUrlFrame"\r
                        android:layout_width="match_parent"\r
                        android:layout_height="wrap_content"\r
+            android:layout_marginBottom="10dp"\r
                >\r
                        <EditText\r
                                android:id="@+id/hostUrlInput"\r
                                android:layout_width="match_parent"\r
                                android:layout_height="wrap_content"\r
+                               android:layout_gravity="bottom"\r
                                android:hint="@string/auth_host_url"\r
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
@@ -56,7 +69,7 @@
                                <requestFocus />\r
                        </EditText>\r
                        <ImageButton\r
-                           android:id="@+id/refeshButton"\r
+                           android:id="@+id/embeddedRefreshButton"\r
                            android:layout_width="48dp"\r
                            android:layout_height="48dp"\r
                            android:layout_gravity="center_vertical|right"\r