Fixed typo in strings.xml

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 7cac19e..e3321f9 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -22,12 +22,14 @@
     android:layout_height="match_parent"\r
     android:layout_gravity="center"\r
     android:fillViewport="true"\r
     android:layout_height="match_parent"\r
     android:layout_gravity="center"\r
     android:fillViewport="true"\r

-    android:orientation="vertical" >\r
+    android:orientation="vertical" \r
+    android:id="@+id/scroll"\r
+    >\r

 \r
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
 \r
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r

-        android:focusable="true"\r
+        android:background="@color/login_background_color"\r

         android:gravity="center"\r
         android:orientation="vertical"\r
         android:padding="8dp" >\r
         android:gravity="center"\r
         android:orientation="vertical"\r
         android:padding="8dp" >\r


@@ -38,6 +40,7 @@
             android:layout_height="wrap_content"\r
             android:layout_marginBottom="10dp"\r
             android:layout_marginTop="10dp"\r
             android:layout_height="wrap_content"\r
             android:layout_marginBottom="10dp"\r
             android:layout_marginTop="10dp"\r

+            android:background="@color/login_logo_background_color"\r

             android:src="@drawable/logo" />\r
 \r
         <Button\r
             android:src="@drawable/logo" />\r
 \r
         <Button\r


@@ -49,6 +52,15 @@
             android:onClick="onRefreshClick"\r
             android:text="@string/auth_check_server"\r
             android:visibility="gone" />\r
             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

 \r
            <FrameLayout \r
                android:id="@+id/hostUrlFrame"\r
 \r
            <FrameLayout \r
                android:id="@+id/hostUrlFrame"\r


@@ -127,21 +139,6 @@
             android:visibility="gone" />\r
 \r
         <EditText\r
             android:visibility="gone" />\r
 \r
         <EditText\r

-            android:id="@+id/account_name"\r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content"\r
-            android:ems="10"\r
-            android:hint="@string/auth_account_name"\r
-            android:inputType="textNoSuggestions" \r
-            android:visibility="gone" />\r
-        \r
-        <WebView\r
-            android:id="@+id/web_sso_view" \r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content"\r
-            android:visibility="gone" />\r
-\r
-        <EditText\r

             android:id="@+id/account_username"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:id="@+id/account_username"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r


@@ -177,20 +174,19 @@
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:onClick="onOkClick"\r
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:onClick="onOkClick"\r

-            android:text="@string/setup_btn_connect"\r
-            />\r
+            android:text="@string/setup_btn_connect" />\r

 \r
         <Button\r
 \r
         <Button\r

-            android:id="@+id/account_register"\r
+            android:id="@+id/welcome_link"\r

             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:background="@android:color/transparent"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:background="@android:color/transparent"\r

-            android:textColor="#0000FF" \r

             android:onClick="onRegisterClick"\r
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
             android:onClick="onRegisterClick"\r
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r

-            />\r
+            android:textColor="#0000FF"/>\r
+\r

     </LinearLayout>\r
 \r
 </ScrollView>
\ No newline at end of file
     </LinearLayout>\r
 \r
 </ScrollView>
\ No newline at end of file