Fixed typo in strings.xml

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

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 73da2b4..88b1ab3 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -20,13 +20,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r
+    android:background="@color/login_background_color"\r
        android:padding="8dip"\r
     >\r
 \r
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
-        android:layout_above="@id/buttonOK"\r
+        android:layout_above="@+id/bottom_block"\r
         android:layout_alignParentTop="true"\r
         android:orientation="horizontal" >\r
         \r
@@ -36,6 +37,7 @@
                        android:layout_height="wrap_content"\r
                        android:layout_weight="1"\r
                        android:layout_gravity="center"\r
+                       android:background="@color/login_logo_background_color"\r
                        android:src="@drawable/logo" \r
                        />\r
                \r
@@ -43,6 +45,7 @@
                    android:layout_width="0dp"\r
                    android:layout_height="match_parent"\r
                    android:layout_weight="1"\r
+                   android:id="@+id/scroll"\r
                    android:fillViewport="true"\r
                    android:orientation="vertical" >\r
                                                \r
@@ -50,7 +53,6 @@
                            android:id="@+id/LinearLayout1"\r
                            android:layout_width="match_parent"\r
                            android:layout_height="wrap_content"\r
-                           android:focusable="true"\r
                            android:gravity="center"\r
                            android:orientation="vertical"\r
                            android:padding="8dp" >\r
@@ -64,7 +66,14 @@
                        android:onClick="onRefreshClick"\r
                                    android:text="@string/auth_check_server"\r
                                    android:visibility="gone" />\r
-               \r
+                               <TextView\r
+                                   android:id="@+id/instructions_message"\r
+                                   android:layout_width="wrap_content"\r
+                                   android:layout_height="wrap_content"\r
+                                   android:layout_gravity="fill_horizontal"\r
+                                   android:text="@string/auth_expired_basic_auth_toast" \r
+                                   android:visibility="gone"\r
+                                   android:layout_marginBottom="10dp"/>\r
                            <FrameLayout \r
                                android:id="@+id/hostUrlFrame"\r
                                        android:layout_width="match_parent"\r
@@ -177,29 +186,33 @@
                                                           \r
        </LinearLayout>\r
        \r
-       <Button\r
-               android:id="@id/buttonOK"\r
-               android:layout_width="match_parent"\r
-               android:layout_height="wrap_content"\r
-               android:layout_above="@id/account_register"\r
-               android:layout_centerHorizontal="true"\r
-               android:enabled="false"\r
-               android:onClick="onOkClick"\r
-               android:text="@string/setup_btn_connect"\r
-               />\r
-\r
-       <Button\r
-               android:id="@+id/account_register"\r
-               android:layout_width="wrap_content"\r
-               android:layout_height="wrap_content"\r
-               android:layout_centerHorizontal="true"\r
+    <LinearLayout\r
+        android:id="@id/bottom_block"\r
+        android:layout_width="match_parent"\r
+        android:layout_height="wrap_content"\r
                android:layout_alignParentBottom="true"\r
-               android:background="@android:color/transparent"\r
-               android:textColor="#0000FF"\r
-               android:onClick="onRegisterClick"\r
-               android:paddingTop="5dp"\r
-               android:paddingBottom="5dp"\r
-               android:text="@string/auth_register" \r
-               />\r
-       \r
+        android:orientation="vertical" >\r
+        \r
+               <Button\r
+                   android:id="@+id/buttonOK"\r
+                   android:layout_width="match_parent"\r
+                   android:layout_height="wrap_content"\r
+                   android:layout_gravity="center_horizontal"\r
+                   android:enabled="false"\r
+                   android:onClick="onOkClick"\r
+                   android:text="@string/setup_btn_connect" />\r
+               \r
+               <Button\r
+                   android:id="@+id/welcome_link"\r
+                   android:layout_width="wrap_content"\r
+                   android:layout_height="wrap_content"\r
+                   android:layout_gravity="center_horizontal"\r
+                   android:background="@android:color/transparent"\r
+                   android:onClick="onRegisterClick"\r
+                   android:paddingBottom="5dp"\r
+                   android:paddingTop="5dp"\r
+                   android:text="@string/auth_register"\r
+                   android:textColor="#0000FF"/>\r
+       </LinearLayout>\r
+               \r
 </RelativeLayout>\r